commit | 5cb79935b9ebb74a410d78a986391dda6e9f7994 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 24 14:12:35 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 14:12:35 2012 -0800 |
tree | 484a0d0257f46d69d555a6842903c9deb02b2b50 | |
parent | cb20fab2ee39cfcb43400b88098b75a8aab4b0e0 [diff] | |
parent | 2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853 [diff] |
am 2ddd7b3e: Reconcile with ics-mr1-release * commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':