tree d80f6e539bdb1fc08d32892ebcb49028481cf163
parent e233a8bf79d624c5419805fde4bb0e025c66b020
parent 68f7fb1cd4ab8a2c427dfe45cb194fea5a9a989a
author The Android Automerger <android-build@android.com> 1364820970 -0700
committer The Android Automerger <android-build@android.com> 1364820970 -0700

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