commit | e8964d4b9593ea5c9f32bfd9cb933f81f3e8bfaf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jan 23 10:41:35 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 23 10:41:35 2012 -0800 |
tree | 42db54861870c0e6abde54f11e624489869f5fb2 | |
parent | 8a3703d909278fd7574086a7dec41ea8cfd324b6 [diff] | |
parent | 4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31 [diff] |
am 4fc84091: Reconcile with ics-mr1-release * commit '4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31':