tree 50277a407a947a09980d6fb497dc5b27b88597e2
parent 76a6dc3a191e8800211eb49398d37deae731094e
parent a6c77d92fcbc2a39758ab28c32b701025d637a7b
author The Android Open Source Project <initial-contribution@android.com> 1349214546 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349214546 -0700

am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit 'a6c77d92fcbc2a39758ab28c32b701025d637a7b':
  JZO54K
  JRO03X