tree e224a74a21d7decb553365685f2fd06bfbbce8cf
parent 594165c17b1a60bac3e428fdff882ea61d12db14
parent 9c94579f0e2a345b01685ac3decf7f3d11f763f4
author The Android Open Source Project <initial-contribution@android.com> 1341347591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341347591 -0700

am 9c94579f: Reconcile with jb-release

* commit '9c94579f0e2a345b01685ac3decf7f3d11f763f4':
  JRO02D