| commit | 1f3c500febd8f3a3271015bb4a59161161fded75 | [log] [tgz] |
|---|---|---|
| author | Brian Colonna <bcolonna@google.com> | Thu Jan 12 06:37:14 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 12 06:37:14 2012 -0800 |
| tree | 12823493d1b9718500ad69feb1d6670900863b88 | |
| parent | b37021a3620ae2f765701eb5d8039643ad27d01b [diff] | |
| parent | 4396642bd5666b7f9e21499caeb321ca1ea3079f [diff] |
am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 * commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a': DO NOT MERGE cherry-picked FU framework tablet commits