tree 3acb417fd14c9d5df23d56c4675259e2aa1ea867
parent dd57d551944c01394bc2807d962be4953c58c7c1
parent a58b6a4bcd0c2877694fc0800852ab58f2e78604
author The Android Automerger <android-build@android.com> 1350084767 -0700
committer The Android Automerger <android-build@android.com> 1350084767 -0700

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