tree 33e98ac517ee16f4ec66c4a05fb7abf249a3cc52
parent 3e0f97d28191bc39ee874a7e4e988b9b2bc3943a
parent ac0d2e9fc0a6c5b86dcbcacbf9ac6ad8810cbdb1
author The Android Open Source Project <initial-contribution@android.com> 1364576077 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364576077 -0700

am ac0d2e9f: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'ac0d2e9fc0a6c5b86dcbcacbf9ac6ad8810cbdb1':