tree 0c4c9281a73adfe829a50709b118b577b429c3b1
parent 19f0e138d0e7f4f1233db4086f04214fd288d919
parent d2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5
author The Android Open Source Project <initial-contribution@android.com> 1345044759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345044759 -0700

am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':