| commit | d84b7029b51651e12de4c0a4bec3faef5c089550 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Mar 19 14:19:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 19 14:19:04 2012 -0700 |
| tree | 87aedb5ed76cfd00e0f891a409b17b77d4a2c2ac | |
| parent | 5b91f942fc7b486e45492b71a38177274d184e11 [diff] | |
| parent | e4d10377f7776df2fa33f9554602187276584cfb [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/cts into ics-scoop-plus-aosp