commit | 61cd0cb55bf73cde1f24194359d489d1d4a2c9ae | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 16 10:14:04 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 16 10:14:04 2012 -0800 |
tree | 36e8c8496e77f8de30c89d988a1b8cc3ba7248ac | |
parent | 5d3592d5762ae88db44b2696b3d555db5f025595 [diff] | |
parent | 1f3e11b4fc17efdd25c67d32879f7e19c9926856 [diff] |
am 1f3e11b4: Reconcile with ics-mr1-release * commit '1f3e11b4fc17efdd25c67d32879f7e19c9926856':