| commit | 35a7859b39260974bd6b996ee54d84bfe3be5278 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:09:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:09:04 2012 -0700 |
| tree | 504537f3914d1dff125dec53bb737b04e111b107 | |
| parent | da8cad50299e12d95ab98995cd2c318d6fa08233 [diff] | |
| parent | a6c3f0b46e7d19493f5f9f53295f384cefee2777 [diff] |
am a6c3f0b4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a6c3f0b46e7d19493f5f9f53295f384cefee2777':