commit | 22a4c1c0069d49a21b918668b6fb74dc739c50ec | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 20 13:11:53 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 20 13:11:53 2011 -0800 |
tree | b2ba4545d3d06a8ccde00a2f5051189f4b3449ae | |
parent | 41338ae6ada23a51e4c7329f4f882efe66615be3 [diff] | |
parent | 2e2c59f4c6dfda378b5ac79037aefd8c4478fe94 [diff] |
am 21cb1290: Reconcile with ics-mr1-release * commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':