Lucas Dupin bd4662cd31 Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am: 3d141421f8 ...

am: 6f8363aea2

Change-Id: I7b6e15910762f9f7ef2b3576778e3f00fc7dd5cd

2017-08-15 20:50:54 +00:00

..

java

Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am: 3d141421f8

2017-08-15 20:50:54 +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 alert dialog when always-on VPN disconnects."

2017-08-15 16:36:58 +00:00

tests

Merge "Write currentDuration into Parcel" into oc-mr1-dev am: bd6ff3d3e5

2017-08-14 22:54:36 +00:00