| commit | 6f200c97081956eeb36dd05c5cdab35992dc053c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:52:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:52:40 2012 -0700 |
| tree | 94ec60fd03cbf5fe0f1db1ca72c4c805a4a42e4d | |
| parent | daff19bc29b11c95022b0250816bcafe8ad4d26c [diff] | |
| parent | b38f3406a5052e1a90358e3ee28cf37a6e506097 [diff] |
am b38f3406: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b38f3406a5052e1a90358e3ee28cf37a6e506097':