| commit | 07e91d269d7fe00ac2a3aa16792da10012e3cd71 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:36:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 11:36:37 2012 -0800 |
| tree | d66cf81a93ed5d3b997c9dd09d3b4638b2a3d685 | |
| parent | 2b1fa59c748202004c7bea584400e872d6d897ee [diff] | |
| parent | b0dd273382349e5a4ed95be405928d0bd76f10db [diff] |
am b0dd2733: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'b0dd273382349e5a4ed95be405928d0bd76f10db': JDP64 JDP60E JDP60D