tree b42bda0ff702383e53b2116d05dcf25749b6f701
parent 5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3
parent 7da95f74c1aabb061687f4f326f6c4f85d790be0
author The Android Automerger <android-build@android.com> 1347548945 -0700
committer The Android Automerger <android-build@android.com> 1347548945 -0700

merge in jb-nakasig-release history after reset to jb-dev