Tarandeep Singh 327c666924 Merge "IME API: rename IMS methods." into pi-dev ...

am: 2b00eaed27

Change-Id: Ia369b8fef6c1c9b7bc9e77059919e4508f1db743

2018-03-07 01:31:05 +00:00

..

java

Merge "IME API: rename IMS methods." into pi-dev

2018-03-07 01:31:05 +00:00

jni

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

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

proto/android

Bluetooth: Use enums for adapter connection states

2018-03-05 17:27:05 -08:00

res

Merge "Update strings that refer to the OS" into pi-dev

2018-03-07 00:11:33 +00:00

tests

Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev

2018-03-06 23:04:16 +00:00