tree fa00d20d099b9a7d2cae2c9ae50268e47e7fbc62
parent f2e0e986c63736a49877030bfcd827b5e15fd29d
parent 91e471772f1acb4786d95c08f1d296ff8ffe2efb
author The Android Open Source Project <initial-contribution@android.com> 1340115637 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340115637 -0700

am 91e47177: Reconcile with jb-release

* commit '91e471772f1acb4786d95c08f1d296ff8ffe2efb':