Tony Mak 1431b86cac Merge "Check in the new work profile icon" into pi-dev am: be0f2a49e2 ...

am: cbf2080d7b

Change-Id: I0afdc1c1a31690ec0f7827fdc8e4115516c16a11

2018-04-12 09:30:19 -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 "Check in the new work profile icon" into pi-dev am: be0f2a49e2

2018-04-12 09:30:19 -07:00

tests

Merge "Remove smart linkify tests from core.LinkifyTest"

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