commit | 096bbea8e02462ed5f527ffc8c245ba72ec00236 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 23 11:20:31 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 11:20:31 2012 -0800 |
tree | 71fd8de84fece4973b37ad5b0968012486666a03 | |
parent | 0db47759bd891a3a597c816ca20cf49a2d68e450 [diff] | |
parent | 610b556fcc1868ec876561cc51428405e2b2ed4f [diff] |
am 98409c29: am 4d4a7290: Reconcile with ics-mr1-release * commit '98409c2983215a7808f1ecbf8af95c3d0d94ab21':