commit | 7f442558d163cae1fda57104cbc8ed35a88c8fff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 20 15:52:24 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:24 2012 -0800 |
tree | 56c7848d1ee483ddb1302ae7e6aea46652f0025d | |
parent | 7c73e8951d91b5afe9d52f88d7ed3a09d120a725 [diff] | |
parent | a201914b3b2f6910b4ce4d58a4f170d9ebaeb174 [diff] |
am a201914b: Reconcile with ics-mr1-release * commit 'a201914b3b2f6910b4ce4d58a4f170d9ebaeb174':