commit | e2cb764778f62819f4e6c0b1d22a5272a9d71ba2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 12 15:29:53 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 15:29:53 2011 -0800 |
tree | 71e6a11df5b08936f7f2d4c570e0eeef726b6c9d | |
parent | 61f90d189833e10c624893a8ab86d25eeb28a0b6 [diff] | |
parent | c14ea96f2f4e36f7a3b3d9676df845afb09c2245 [diff] |
am c14ea96f: Reconcile with ics-mr1-release * commit 'c14ea96f2f4e36f7a3b3d9676df845afb09c2245':