Alex Klyubin 160a253d48 am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute." ...

* commit 'd71f548f4803f0696af7de9a2989673cfd83800f':
  Add app-level usesCleartextTraffic manifest attribute.

2015-03-19 16:43:52 +00:00

..

java

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

2015-03-19 16:43:52 +00:00

jni

Merge "Fix missing printf argument."

2015-03-18 00:07:45 +00:00

res

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

2015-03-19 16:43:52 +00:00

tests

Merge "NetworkStats to support VPN accounting."

2015-03-12 22:10:56 +00:00