| commit | 59e6ddb8edc8570119ffa90c0733764615e81aa7 | [log] [tgz] |
|---|---|---|
| author | Jason Noguchi <jnoguchi@google.com> | Tue Apr 03 16:32:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 03 16:32:49 2012 -0700 |
| tree | 5f39dd4f9e59cba845bf3003e2a69bad8c8517d1 | |
| parent | 11204854bbdd23080c7d382042c0ce8528f3be06 [diff] | |
| parent | bfdb5bbdca0cdcb1c205846860d4916b65bdc2e2 [diff] |
am bfdb5bbd: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit 'bfdb5bbdca0cdcb1c205846860d4916b65bdc2e2':