Felipe Leme 3c0555eca0 Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp ...

am: 08ca3cc7e8

Change-Id: I86ad97ddb4060a2fbd23e7a2105ee4c98b782b46

2017-08-17 03:04:57 +00:00

..

java

Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c

2017-08-17 02:59:38 +00:00

jni

Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c

2017-08-17 02:59:38 +00:00

proto/android

Update WindowManager to output dumpsys in protobuf format

2017-08-14 17:06:17 -07:00

res

Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp

2017-08-17 03:04:57 +00:00

tests

Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp

2017-08-16 19:22:46 +00:00