tree 4d7c2994036a50e84781ce2fbc8d494ca990e25a
parent 8f908c0c211f8051f339bc85b01a6450f0dfd7d0
parent fb5cee14445622010af46da1fe9a013fe3868d48
author The Android Automerger <android-build@google.com> 1370452290 -0700
committer The Android Automerger <android-build@google.com> 1370452290 -0700

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