tree ea285cc37eadc8786c4491de6081ae24cbd18ba6
parent a5dc519dfa9982e79a38bd215be7d39c3a8ca751
parent 18f1ead4a313b16a7b605ab12996e1995ccf3d0b
author The Android Automerger <android-build@android.com> 1343666772 -0700
committer The Android Automerger <android-build@android.com> 1343666772 -0700

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