tree 1b82f5a9658b1bf227af1f66475dc092d00aa5d6
parent 06f4971bc05dc14fb567f3cc794af210c507b14d
parent 8b3b47ee437ace527521892a8dc31ace384962df
author The Android Automerger <android-build@android.com> 1364388950 -0700
committer The Android Automerger <android-build@android.com> 1364388950 -0700

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