| commit | 25b1e93b052ed3590c1ee4d03476c242187de36b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 12 15:39:19 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 15:39:19 2011 -0800 |
| tree | ed289e8d756105114a04b35dbef3c027454f49f7 | |
| parent | 50a44951baf856cda679e78947e369ce923a6517 [diff] | |
| parent | 956a9787cfaf429f951549df6e587c6ce4ac20f8 [diff] |
am 40375099: Reconcile with ics-mr1-release * commit '40375099d10139b6c96c1db8b8295874d60c712e':