Chad Brubaker 1627a091f4 Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 ...

am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install

2015-11-17 21:18:12 +00:00

..

java

Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647

2015-11-17 21:18:12 +00:00

jni

Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9

2015-11-16 19:03:53 +00:00

res

Import translations. DO NOT MERGE

2015-11-16 14:18:40 +01:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00