| commit | 048b80994f0199c57cfd5fea9a2d4b1ef87cc1fd | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue Apr 03 11:22:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 03 11:22:36 2012 -0700 |
| tree | acc4998711a8501a93b5be790c23a0ba5e8d5c90 | |
| parent | 7ebe18f4d4d259732f95075f95e0bd5362816632 [diff] | |
| parent | b4b157a5dfbb58806fe1bd816192338d24da6c6c [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp