| commit | 58226c0825abd1fd753a823f958dabe78761b5e3 | [log] [tgz] |
|---|---|---|
| author | Dan Bornstein <danfuzz@android.com> | Tue Nov 17 16:38:57 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 16:38:57 2009 -0800 |
| tree | 2b6aa7ad91b14478b777d30ccc4c104b7a24f4a3 | |
| parent | cb3e80cd55cd1fca3e3be390f8b8b68470c1bbae [diff] | |
| parent | 39b99e4f593e2af103f6d21bc24776c264ee7ab3 [diff] |
am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2 Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3' * commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3': Add the example test to the CTS.