| commit | bf324a1c2809403f2dc18afffd8f1202a99e2ba8 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 15 10:38:42 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 15 10:38:42 2012 -0700 |
| tree | 3ad66d15a6e195d22dcaaaf2c321397c2762ed4a | |
| parent | 8fc949ebb1963fa053f7b2b1436989f479c20348 [diff] | |
| parent | 40b4f04ac3f8dd11fc1313472aca3713b34d7f6a [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp