tree b88c6115147083b544f1493f5ae04c7fbf314ab1
parent 09bdd38ba65458c07faf61693eb6f95cf56a0921
parent c7314cea25a040536048bf19515c8fa9e22fee95
author The Android Open Source Project <initial-contribution@android.com> 1345675206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345675206 -0700

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

* commit 'c7314cea25a040536048bf19515c8fa9e22fee95':