| commit | 39b99e4f593e2af103f6d21bc24776c264ee7ab3 | [log] [tgz] |
|---|---|---|
| author | Dan Bornstein <danfuzz@android.com> | Tue Nov 17 16:35:22 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 16:35:22 2009 -0800 |
| tree | 6ed8bb9568604d849a42c0cd2454a062ada853ff | |
| parent | 3a4b4985ed9dafc01fd372474d40ec85bcc7f027 [diff] | |
| parent | 34ce59147ca68f81a36ab05533a90199147ef3c7 [diff] |
am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2 Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp * commit '34ce59147ca68f81a36ab05533a90199147ef3c7': Add the example test to the CTS.