| commit | 634db5823f7406102a599220bc8c808e8d18e136 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Mar 16 14:17:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 16 14:17:09 2012 -0700 |
| tree | 962ac4b72db144e05a400e682c40e32b98b5e924 | |
| parent | 65e4b90d6cc3673e70b6b94fa1566e31eb44ffc7 [diff] | |
| parent | 579922e331e14508ee810305575817c583f6e42c [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp