tree 3ab907d23c9847f41962d2a6e16c1558a9f65140
parent 0419b446598f0c3cbf46ef2f2973e043338ac988
parent c1c571ecbf9efe17dbab103d408007e83d94820f
author The Android Open Source Project <initial-contribution@android.com> 1346105831 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346105831 -0700

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

* commit 'c1c571ecbf9efe17dbab103d408007e83d94820f':
  JRO03U
  JRO03T
  JZO54