OSDN Git Service

am 3db7a730: Merge change 4880 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Jun 2009 20:08:23 +0000 (13:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Jun 2009 20:08:23 +0000 (13:08 -0700)
Merge commit '3db7a730bce818196c216945f866939bf8a7401f'

* commit '3db7a730bce818196c216945f866939bf8a7401f':
  Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.


Trivial merge