tree 85f2369be584c47eb3277a117750fa4a3c5dd04a
parent 0191be1d6795340cc20dc0388d80b4df1302a773
parent f1bfab47b89c8fab7811339c02848ee5a10ec335
author The Android Open Source Project <initial-contribution@android.com> 1365037529 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365037529 -0700

am f1bfab47: Reconcile with jb-mr2-release - do not merge

* commit 'f1bfab47b89c8fab7811339c02848ee5a10ec335':