commit | 66e069e64ff9f81d3e2ad5f4347855aeb29f1efe | [log] [tgz] |
---|---|---|
author | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 11:46:50 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 11:46:50 2012 -0700 |
tree | 4562f13f8f5732a79aad89ac4e6ad4f458e1aaf3 | |
parent | 51635e1bd2fc38a0c3a3b8e6e26d7866e3063c18 [diff] | |
parent | f121d840408a335fbbbeee7536a5b5546b2ad12b [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp