tree 31903fb0c9200b9916ccaa087f95aacbe8a5e388
parent e52ca3b3bd0eafa25d93d75dc084a2971092f05b
parent ae8215922df8081a8824566c65a9ebc0f553cfdd
author The Android Automerger <android-build@android.com> 1366721746 -0700
committer The Android Automerger <android-build@android.com> 1366721746 -0700

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