| commit | 829aaeea91686d918bc3ea7d86320395a25ec3f8 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Mar 20 17:55:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 17:55:01 2012 -0700 |
| tree | 647d4bdcfcc48b74e2fb61a76497cf1d180a684a | |
| parent | 525a058c0095104d677d278e874e55de9310aac4 [diff] | |
| parent | 634db5823f7406102a599220bc8c808e8d18e136 [diff] |
am 634db582: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '634db5823f7406102a599220bc8c808e8d18e136':