Dianne Hackborn 2bbd02bbd8 am 93b55c11: Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" ...

* commit '93b55c1149bb4a03b0df7887182265969af2ab71':
  Implement wifi part of issue #12973036: Improve power_profile.xml

2014-02-18 14:47:07 -08:00

..

java

am 93b55c11: Merge "Implement wifi part of issue #12973036: Improve power_profile.xml"

2014-02-18 14:47:07 -08:00

jni

Remove call to setIsOpaque (again).

2014-02-17 10:46:39 -05:00

res

am 5b12ed57: Merge "Lock down MANAGE_DOCUMENTS permission."

2014-02-18 14:42:41 -08:00

tests

am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."

2014-02-17 18:32:44 +00:00