OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 16 Dec 2010 15:39:01 +0000 (07:39 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 16 Dec 2010 15:39:01 +0000 (07:39 -0800)
commit5dba3edc3f7e3cb1fbbb832919aa88934b8e32dd
tree9c87338b10e9bea3b9f9c484cb9b024c059ea394
parent075a8b652270c3f76c5f22146da798d2c842146f
parenta8d91ff6e369f7d2f54131a4f200f680d2ab6c82
Merge branch 'master' into honeycomb-release

* master:
  Scrub the set of dalvik modules that are built by default
  Add framework includes for any aidl source.