tree 360d2cf9ec65fdc28ea1b5d65a12438ba8ade345
parent 7e1820a7224c9b8726c1687924ff81dda20af5cc
parent afa8348248f9aa7cca59e1c74992fcd7ac6cbd90
author The Android Open Source Project <initial-contribution@android.com> 1354563406 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354563406 -0800

am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'afa8348248f9aa7cca59e1c74992fcd7ac6cbd90':