tree d3cd7591250a85b7db17b7f08d5c9422f5deb31d
parent 696923ac7ff5a71f6a80f18c813f465ffb53cc58
parent 90b655315e9edcc6d253db0d06f829be55c7818e
author The Android Open Source Project <initial-contribution@android.com> 1348817539 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817539 -0700

am 90b65531: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '90b655315e9edcc6d253db0d06f829be55c7818e':
  JOO89
  JOO88C
  JOO88B