tree 1194565543bfda60d1b4a6db79c3badadf39aa62
parent 2ca1f2a7a4cec46988bfc95df5ac056316584f98
parent d2132589c1826efaba91124c7b6e9a9cc4e12bc1
author The Android Automerger <android-build@google.com> 1370452799 -0700
committer The Android Automerger <android-build@google.com> 1370452799 -0700

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