commit | 6d3deeede48d298f95643a98e0bb8636bfbe906e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 13 05:40:57 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 13 05:40:57 2011 -0800 |
tree | ed289e8d756105114a04b35dbef3c027454f49f7 | |
parent | 25b1e93b052ed3590c1ee4d03476c242187de36b [diff] | |
parent | df4856c3e34231ba0998814cd1c4d9e33dd929b6 [diff] |
am da296533: Reconcile with ics-mr1-release * commit 'da29653305f299d6390492333a6360cfa78665d9':