| commit | 4684daaed5bb005b14e65d7228b1bd8512560ade | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 16 10:06:50 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 16 10:06:50 2012 -0800 |
| tree | 8b5effb8ca3f34d070a8a938f2aaac787ca4e4d6 | |
| parent | f1cf90d8fd9d01baa90224e1594c38aecf2224ff [diff] | |
| parent | 8f8d5ad9b4de3cd088c05b1dd2961e7cdc80f778 [diff] |
am 8f8d5ad9: Reconcile with ics-mr1-release * commit '8f8d5ad9b4de3cd088c05b1dd2961e7cdc80f778':