commit | 08ab9a5766b6825b19876fbf5b14779fc24b474b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 05 08:56:34 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 05 08:56:34 2011 -0800 |
tree | 8dbdd1a9352f585638e4cadd9344322685761a6e | |
parent | 0de996a108cc507f418993f236e964967612f5c9 [diff] | |
parent | 37cd69eda42461c480bd8e1c18580f18386eeaf7 [diff] |
am 0975d53f: Reconcile with ics-mr1-release * commit '0975d53f17d90fa9642f0f4f8222977ce5911d80':