Robert Greenwalt 097e5f3710 am 511ecc8c: am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom ...

* commit '511ecc8cf9f1b0660c4284f667cbc3807d2ebf82':
  Tell the resolver what protocols to use.

2011-09-22 23:44:49 -07:00

..

com/android/server

am 511ecc8c: am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom

2011-09-22 23:44:49 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00