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

am: 4351aecb2d

Change-Id: I3b2b7dcb1a9a194fc08643b27bbb5a0e84e01412

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

..

java

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

jni

Merge "Support multiple languages per font in fonts.xml"

2017-08-11 23:27:50 +00:00

proto/android

Update WindowManager to output dumpsys in protobuf format

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

res

Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev am: 4b7b5a6c59

2017-08-16 17:15:08 +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