Rohan Shah 8319f2db3d Merge "[Notif] Allow locking importance on notification" into pi-dev am: 8e7f23a74c ...

am: 0c91614746

Change-Id: I2710212987e9647d23d80d972ef826dc2358c53e

2018-04-12 08:08:13 -07:00

..

java

Merge "[Notif] Allow locking importance on notification" into pi-dev am: 8e7f23a74c

2018-04-12 08:08:13 -07:00

jni

Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev am: 42c686861c

2018-04-10 12:35:14 -07:00

proto

Merge "Cleaning up frameworks protos." into pi-dev

2018-04-12 09:55:45 +00:00

res

Merge "Move accessibilityHeader from TextView to View" into pi-dev am: 99a238adf1

2018-04-11 20:23:53 -07:00

tests

Merge "Remove smart linkify tests from core.LinkifyTest"

2018-04-11 21:30:09 +00:00