Richard Ledley b956d0b81d Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev ...

am: 847446d7f8

Change-Id: I1ad63dda26b397c26fa05520103e504bcf6f8127

2018-03-07 17:42:02 +00:00

..

java

Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev

2018-03-07 17:42:02 +00:00

jni

Merge "AID: Change loop to repeat and set from xml"

2018-03-05 01:23:19 +00:00

proto/android

Add APP_AUTO_RESTRICTION_ENABLED

2018-03-06 21:33:37 +00:00

res

Merge "System sounds get its own dnd toggle" into pi-dev

2018-03-07 16:39:40 +00:00

tests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-03-07 11:42:04 +00:00