tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent 1de84e96dece45e2d7793e7111a509ef1f9879f6
parent de764172b85e86436724a47d19f642dacf73b9fe
author The Android Open Source Project <initial-contribution@android.com> 1365535926 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535926 -0700

am de764172: am 4f14d40c: Reconcile with jb-release

* commit 'de764172b85e86436724a47d19f642dacf73b9fe':