commit | e380481381b8679bf4bd4afb922e82e0a849b2bb | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 17 10:46:48 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 17 10:46:48 2012 -0800 |
tree | 5255e77b592b16fcc4b221f7e15784b03f6630e9 | |
parent | 50ff08a24e7a94c196f9b5c0b5b9ebdc03064a36 [diff] | |
parent | f5f5d61c611b6f2c699ba472972e0b5c33c82402 [diff] |
am f5f5d61c: Reconcile with ics-mr1-release * commit 'f5f5d61c611b6f2c699ba472972e0b5c33c82402':