commit | f8c318460ebd3fba9d34d67fc7bce193f02b7f9c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 23 11:20:00 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 11:20:00 2012 -0800 |
tree | 5bccdcd77bf39b40ca85aca3ee13d5b5c8841384 | |
parent | 3cd56a44a0e8a2e7efb8dde5af17fc2a95e9ffdd [diff] | |
parent | 2b7bf5d10c4fd516a2ec761fc4aa97a8f39a2f7a [diff] |
am 2b7bf5d1: am e3281dc1: Reconcile with ics-mr1-release * commit '2b7bf5d10c4fd516a2ec761fc4aa97a8f39a2f7a':