| commit | 12cd8f22622168def0a6aa3c90f91efbe8dcde4e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:37:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:37:21 2012 -0700 |
| tree | 31e75609d910393b5511c0afe2cec2e09b3d544f | |
| parent | e1313ab5389436a0c9af25fb24d0745fcc54597f [diff] | |
| parent | cbe4a8dd3d11fea2134e9c6d3f2a5c0e865ac490 [diff] |
am cbe4a8dd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cbe4a8dd3d11fea2134e9c6d3f2a5c0e865ac490':