commit | 7ccc5a3f0604adf6fc6994c824ef10d380ae0a92 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 09 14:57:42 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:57:42 2011 -0800 |
tree | 1dab00f7d8f20cac6c09f31e50093a670e8f8059 | |
parent | 559d42373a1a62e82a3a5a6d8c6d12d251b3778f [diff] | |
parent | 3f9a60cccc7498f369edb0ef490b41e9ac983842 [diff] |
am 3f9a60cc: Reconcile with ics-mr1-release * commit '3f9a60cccc7498f369edb0ef490b41e9ac983842':