| commit | 6b822aafd4bc06493a31b880ff3211928dd82882 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 15:35:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 15:35:49 2012 -0800 |
| tree | 00dcde9cbb4bbc68c530e16b65fab42695be626c | |
| parent | 32620e4f6bf56fe449e23a328be1a1f672bd3dad [diff] | |
| parent | 55fbbce495723a5b17f1b4684d0f9826c75caa97 [diff] |
am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':