tree e4ab5c54c009ca953c46cb71c78fac9c24883ee9
parent 13e20fc82daf9e04fa2ed44e6b4b940ed487ee09
parent 8970fe287e798d543c0ac9aff2e076ba6ba4746e
author The Android Automerger <android-build@android.com> 1365684972 -0700
committer The Android Automerger <android-build@android.com> 1365684972 -0700

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