commit | 1e40e8433d783e4f06be1fb4029fdceca1e7ad6a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 24 14:09:27 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 14:09:27 2012 -0800 |
tree | 677beee017f4dec2418cbda4642e6dc9fe1faea8 | |
parent | 561741493b4f99135dd840c7f1da15a2199a4775 [diff] | |
parent | ee87007e15b1c171911e43713582efd9b187d205 [diff] |
am ee87007e: Reconcile with ics-mr1-release * commit 'ee87007e15b1c171911e43713582efd9b187d205':