| commit | 01d8e20cc622e7e27eded79b90e773e99c092fdf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:23:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:23:56 2012 -0800 |
| tree | 6c9c0e85f25fc283165266d7ac7e31a2e6300a10 | |
| parent | d13c504986defd947be6e5d7957437de5e9b53bb [diff] | |
| parent | e78e7f1bae1ddbf6cbda70bd5917940b4b6fb424 [diff] |
am e78e7f1b: (-s ours) am fb8b02eb: am 073d6225: Reconcile with jb-mr1-factory-release - do not merge * commit 'e78e7f1bae1ddbf6cbda70bd5917940b4b6fb424':