| commit | ce8e4587d6bf9d39c0529aa1f9d0a357f6f2d98b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 30 14:05:13 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 30 14:05:13 2011 -0800 |
| tree | 8db44374c456d8629150fe944a90808982f3fd24 | |
| parent | 66413b5fb59feea258caf0629fe59f46cc7b4326 [diff] | |
| parent | a55ca7d7d20c1f2d1bf5be6d2cc38ec03ac175da [diff] |
am a55ca7d7: Reconcile with ics-mr1-release * commit 'a55ca7d7d20c1f2d1bf5be6d2cc38ec03ac175da':