tree ba3470199ad4e53d0b4d5e96026b07f4391bde46
parent 50bdf7e04483455f2b9d112373ce1cb6a738141b
parent 6f1706a18150f8452d992a424eaef6497768c17a
author The Android Automerger <android-build@android.com> 1366808145 -0700
committer The Android Automerger <android-build@android.com> 1366808145 -0700

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