tree b434273c2c13c59465c67b6575c58cd6fba43b8f
parent 795d21f14da4538ff4727b2df3c5cf4f70563af9
parent 4aafb5c3f14fe4e5fd28d57cc933a60063b7b8ff
author The Android Automerger <android-build@android.com> 1365425791 -0700
committer The Android Automerger <android-build@android.com> 1365425791 -0700

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