commit | c1c571ecbf9efe17dbab103d408007e83d94820f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 27 15:13:12 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 27 15:13:12 2012 -0700 |
tree | 3ab907d23c9847f41962d2a6e16c1558a9f65140 | |
parent | 4df0782b3adfd03c167111790fdf5a9de676080c [diff] | |
parent | 28f37bb992853a877980ea0d1040df2e46ee71c1 [diff] |
am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '28f37bb992853a877980ea0d1040df2e46ee71c1': JRO03U JRO03T JZO54