tree 07e0ca73472ff1ea0945df9a0f33a17dce579e07
parent 56d796a9b09725fc44714bc2216d6bc6c4746b95
parent 5cea41920d622ec4e6f1134458e04d8f5fc48ef1
author The Android Automerger <android-build@android.com> 1368104136 -0700
committer The Android Automerger <android-build@android.com> 1368104136 -0700

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