Alex Klyubin 2110a28a6c am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy." ...

* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.

2015-03-20 18:08:30 +00:00

..

java

am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."

2015-03-20 18:08:30 +00:00

jni

Revert "Change jit properties to be debug properties"

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

res

am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."

2015-03-19 16:21:40 +00:00

tests

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

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