commit | 150e000516d4888799a872c14c37bdaf75b6fcda | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 09 14:57:41 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:57:41 2011 -0800 |
tree | 341ffe38de7aab853a4aacb1e0b8d193cb0cf561 | |
parent | fa6dfd2e95091b00b269963eeb9473f2441f2dc2 [diff] | |
parent | 19417befca4aa6b3d55b6d23103b75ee54ff6e89 [diff] |
am 19417bef: Reconcile with ics-mr1-release * commit '19417befca4aa6b3d55b6d23103b75ee54ff6e89':