commit | 6ca9d204cdfe2a474335451d3068ede4a712dce2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 16:37:59 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 16:37:59 2012 -0800 |
tree | 70920252f81e7bb2a2c29ccfb1def65f5dab0dfc | |
parent | 1eb99caa73fa240bbfb603196be26bb92c699b9e [diff] | |
parent | 546dc10c1a7c6fb348507899d3629af01b4e4c43 [diff] |
am 546dc10c: Reconcile with ics-mr1-release * commit '546dc10c1a7c6fb348507899d3629af01b4e4c43':