OSDN Git Service

am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2
authorDan Bornstein <danfuzz@android.com>
Wed, 18 Nov 2009 00:38:57 +0000 (16:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Nov 2009 00:38:57 +0000 (16:38 -0800)
commit58226c0825abd1fd753a823f958dabe78761b5e3
tree2b6aa7ad91b14478b777d30ccc4c104b7a24f4a3
parentcb3e80cd55cd1fca3e3be390f8b8b68470c1bbae
parent39b99e4f593e2af103f6d21bc24776c264ee7ab3
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.