| commit | e75abda25a4a638599b36ba8dc21fe4ddefd61ab | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Feb 06 13:09:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 06 13:09:08 2012 -0800 |
| tree | 49c5b2f9cdc0625a6cabbfb774ea1e0c5184ecd6 | |
| parent | 6d41c9a96e085eed31ab8d689e6ca6f01e5e03b2 [diff] | |
| parent | 6f2f42d52a23de0bd639d5e4957331118ccc47b8 [diff] |
am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':