tree 8e7192e1904911f57b08191145461c4fa6b73dc7
parent 3cf12f4112167cb3372cbdba2b66d48a5d56dc4b
parent e215b2e59b236ba4f044da477ba8cfe030f86a35
author The Android Automerger <android-build@android.com> 1366808132 -0700
committer The Android Automerger <android-build@android.com> 1366808132 -0700

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