| commit | 086d998cd0633d4e909e584be1bec449c23e7a2c | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Feb 06 13:11:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 06 13:11:03 2012 -0800 |
| tree | 51e55f7502f58bc5841ee345737f60068de663ca | |
| parent | 6c53a05d9e04ca785094aa7621a579b4f2a9165b [diff] | |
| parent | e75abda25a4a638599b36ba8dc21fe4ddefd61ab [diff] |
am e75abda2: am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit 'e75abda25a4a638599b36ba8dc21fe4ddefd61ab':