tree 0b4128407987b08c36a17561425dee5515bd5609
parent a009d2c98da9749bf6ae4d92ef5fb3d3e945530f
parent 2d2519d9e229572ef9083b8fd2ee5ff64f36c8b2
author The Android Automerger <android-build@google.com> 1370782555 -0700
committer The Android Automerger <android-build@google.com> 1370782555 -0700

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