tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent 8448c8f65b6f12c9e20e264cf124f8a398cf0b80
parent cb7b9562efda73b162022df58e9ca1d37f3bc25e
author The Android Open Source Project <initial-contribution@android.com> 1365535924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535924 -0700

am cb7b9562: am e9792f85: Reconcile with jb-release

* commit 'cb7b9562efda73b162022df58e9ca1d37f3bc25e':