tree 50cb83e8943ea0905602c375a688f6a215dfd3c8
parent 05c0c1a4b70392cf7a8a3fd7d12f99e597a3e996
parent f7fea7522d422105ad7cf75987b4927c055bd292
author The Android Automerger <android-build@google.com> 1370452671 -0700
committer The Android Automerger <android-build@google.com> 1370452671 -0700

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev