tree 3ab907d23c9847f41962d2a6e16c1558a9f65140
parent 4df0782b3adfd03c167111790fdf5a9de676080c
parent 28f37bb992853a877980ea0d1040df2e46ee71c1
author The Android Open Source Project <initial-contribution@android.com> 1346105592 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346105592 -0700

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

* commit '28f37bb992853a877980ea0d1040df2e46ee71c1':
  JRO03U
  JRO03T
  JZO54