Mathieu Chartier b7d997a7b7 Merge "Revert "Change jit properties to be debug properties""

2015-03-19 16:44:59 +00:00

..

java

Merge "Add app-level usesCleartextTraffic manifest attribute."

2015-03-19 16:10:20 +00:00

jni

Revert "Change jit properties to be debug properties"

2015-03-18 19:07:02 -07:00

res

Add app-level usesCleartextTraffic manifest attribute.

2015-03-18 10:46:56 -07:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00