commit | c071d874386564832ba0b4a87242fb786f96764c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 02 16:48:24 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 02 16:48:24 2012 -0800 |
tree | 6a787f9792f597b3bf64f8f51d28c9d41ae492b0 | |
parent | 80bc2bf70571aee54eb3265f41260190fe904b6e [diff] | |
parent | 37d6d98fe3ea739627e03b78196faba55b427503 [diff] |
am 37d6d98f: Reconcile with ics-mr1-release * commit '37d6d98fe3ea739627e03b78196faba55b427503':