Chavi Weingarten 7f5265ebfc Merge "Added jni and SurfaceControl methods for native setColor"

2017-09-22 20:33:46 +00:00

..

java

Merge "Added jni and SurfaceControl methods for native setColor"

2017-09-22 20:33:46 +00:00

jni

Merge "Added jni and SurfaceControl methods for native setColor"

2017-09-22 20:33:46 +00:00

proto/android

Merge "incidentd: Adding Notification Listener and Disabling Effects Data to NotificationManager proto output."

2017-09-22 18:08:00 +00:00

res

Merge "Import translations. DO NOT MERGE"

2017-09-22 18:33:05 +00:00

tests

Merge "Pass text direction from StaticLayout to Layout"

2017-09-22 14:28:00 +00:00