| commit | 884d8e34f0483cd19a6324fb8345ee14e4949dc5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 09 14:57:53 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:57:53 2011 -0800 |
| tree | 0be6cf4212e634e0a7c5770dd670a1aeca1e21db | |
| parent | 56de8e10ca290d46c26831d298d5cc7673a168ff [diff] | |
| parent | a68fdbbaee6760998cbcc6b340b35dc4cf0b3138 [diff] |
am a68fdbba: Reconcile with ics-mr1-release * commit 'a68fdbbaee6760998cbcc6b340b35dc4cf0b3138':