Tony Mak ed8e0f6fe6 Merge "TextSelection.Builder.setId should take null as well" into pi-dev ...

am: 10f8ed0cf8

Change-Id: I4ebb83d6fc174ad3bb68cfded32505dc29327ee3

2018-05-16 17:02:41 -07:00

..

java

Merge "TextSelection.Builder.setId should take null as well" into pi-dev

2018-05-16 17:02:41 -07:00

jni

Merge "Add support for manually set surround formats." into pi-dev

2018-05-15 14:10:39 -07:00

proto

Switch the setting for Off Body Radios Off to User Absent Radios Off

2018-05-09 21:11:44 -07:00

res

Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev

2018-05-16 16:47:06 -07:00

tests

Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576

2018-05-16 14:14:27 -07:00