tree 369616a75348b772429aa1393d4f177d50dbfa7d
parent 1e7c475ec2b5c411107dd9f994f9152040f73933
parent 3db7a730bce818196c216945f866939bf8a7401f
author Android (Google) Code Review <android-gerrit@google.com> 1245787703 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245787703 -0700

am 3db7a730: Merge change 4880 into donut

Merge commit '3db7a730bce818196c216945f866939bf8a7401f'

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