Tarandeep Singh 01041c97ff Merge "IME API: rename IMS methods." into pi-dev am: 2b00eaed27 ...

am: 327c666924

Change-Id: I49cfc349a87cd6b9d116b67102178d0bf6219f3d

2018-03-07 03:38:54 +00:00

..

java

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

2018-03-07 03:38:54 +00:00

jni

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

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

proto/android

Merge "Add APP_AUTO_RESTRICTION_ENABLED"

2018-03-06 20:48:28 +00:00

res

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

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

tests

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

2018-03-07 01:36:41 +00:00