| commit | a38c91d63aeb3f08eeb1a7afa0a4494d0e9f3b45 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:49:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:49:10 2012 -0700 |
| tree | 03700a63195ca3af3987aaf526edbcc69a0ecf77 | |
| parent | 6c2bd05b7e601f5d2b45374a55a63a969ae2f486 [diff] | |
| parent | f01862c933fe03dbd411a668629b3ea367102830 [diff] |
am f01862c9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f01862c933fe03dbd411a668629b3ea367102830':