Andy Stadler 04ddff6905 am b1835085: Merge "@hide DPM global proxy settings" into honeycomb ...

* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
  @hide DPM global proxy settings

2011-02-16 12:20:36 -08:00

..

config

…

java

am b1835085: Merge "@hide DPM global proxy settings" into honeycomb

2011-02-16 12:20:36 -08:00

jni

Fix crash when Paths are GCd in hw accelerated apps

2011-02-04 12:50:55 -08:00

res

am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb

2011-02-16 10:38:11 -08:00

tests

am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb

2011-01-31 18:51:56 -08:00