commit | 83ccdc4e37a842a137b8f611f6517ed5665760e0 | [log] [tgz] |
---|---|---|
author | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 15 11:39:17 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 15 11:39:17 2012 -0700 |
tree | fdd197c4cd33c768d904e3d135c557371e6f039f | |
parent | 49495f858a743fac51b94b35a68063a2737d9780 [diff] | |
parent | bf324a1c2809403f2dc18afffd8f1202a99e2ba8 [diff] |
am bf324a1c: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit 'bf324a1c2809403f2dc18afffd8f1202a99e2ba8':