commit | d00f2c04613dc3fd57062b60fdff18f0465ddecd | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 06 18:16:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 06 18:16:32 2012 -0800 |
tree | ba0eed4e0eb8bb248aaf5f10616336e0b3e47cf5 | |
parent | bdb7b65693c111e653537e3d1f01ba72942486f0 [diff] | |
parent | c996fdc80a165d23291f2080b77b801294de944a [diff] |
am c996fdc8: Reconcile with ics-mr1-release * commit 'c996fdc80a165d23291f2080b77b801294de944a':