tree 05de98e89204849bda7ecaa8a1c2504af41f3f24
parent d51f33a6316c34fc69b8040946ed9a62519bb225
parent e2ad335cc2bac806aa22544c1b3b109b0bbec746
author The Android Open Source Project <initial-contribution@android.com> 1340983176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340983176 -0700

am e2ad335c: Reconcile with jb-release

* commit 'e2ad335cc2bac806aa22544c1b3b109b0bbec746':