tree ccfb68f20b4b70a0fdf9f543382498116b77b46f
parent 303f621e574e69d46e207530737e279ed42d9c43
parent 22057fe9b89856b4849164b60cbdf59e9f8483bf
author The Android Automerger <android-build@android.com> 1350686786 -0700
committer The Android Automerger <android-build@android.com> 1350686786 -0700

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