OSDN Git Service

Merge change 4880 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Jun 2009 17:30:20 +0000 (10:30 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Jun 2009 17:30:20 +0000 (10:30 -0700)
commitd2082cf7e949139c3bbb50db7dfc3145892b1115
treeeafa2bd379e87fc36bfac3671a94247421d1b7ee
parent3233d55cc53171fe4fe83f79f04d366da79b0910
parentd4dcd8d88d062ad4f77333ee226dcffb064c1428
Merge change 4880 into donut

* changes:
  Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.