commit | 1275c55fd6579dd3a013c922d985a73b3117a3c4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 13 05:40:52 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 13 05:40:52 2011 -0800 |
tree | f550026a277b6b4696dc2a1ba1081b2bb0e1d505 | |
parent | cc0035973e182854476b00dff93df4a2226efd8c [diff] | |
parent | afe287f9ce042241da7a8b88b5e4134555fcbc10 [diff] |
am afe287f9: Reconcile with ics-mr1-release * commit 'afe287f9ce042241da7a8b88b5e4134555fcbc10':