commit | c9bb527e3a3a22b294e11cb0352ab7dd4e4376fb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:27 2012 -0800 |
tree | ef46f52aa0563e1300e2ee439cda2c936e09286f | |
parent | 30627217223af8631669d02f3a00fa58cbc45887 [diff] | |
parent | e92217b023c4b040be95c178faa2ccbb510a8f38 [diff] |
am 7e11af8f: Reconcile with ics-mr1-release * commit '7e11af8f5813972dd64032e70068e10f87771234':