| commit | 59015b369ddb4a60587d546d39d2511b2812b60f | [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 | ab32ca45626f919c2563342804d59811704c5628 | |
| parent | 29a0fb12d897162eded3b0fe563c30e64a8a2936 [diff] | |
| parent | 52d55d8847764107de444b5fc794a6c21cb7dce6 [diff] |
am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':