commit | 2e4afc4a8cb30445eee7f944b778caca47605864 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:18 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:18 2012 -0800 |
tree | e46ed44204cfcbbdb8b1217290a2b9817fd66fa3 | |
parent | 62c5e28e2b9034b645d5c1d9821d743dcc75941e [diff] | |
parent | 1f38f72abdc43ac2131e86db3e834a234f7cfaad [diff] |
am 1f38f72a: Reconcile with ics-mr1-release * commit '1f38f72abdc43ac2131e86db3e834a234f7cfaad':