tree 72eb425348bf7d44b464f26200dd514baa12a75a
parent de25d3a88d8b9dc4f4270eae561b23dab2a3a52d
parent bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea
author The Android Open Source Project <initial-contribution@android.com> 1351700572 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700572 -0700

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

* commit 'bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea':