Scott Main 4c0a4ca1b1 Merge "Fix javadoc typo causing broken links" into oc-mr1-dev am: ac2cdc0dba am: 655d98bdb5 ...

am: 6cf55a5332

Change-Id: Iaf07695e55e8b5eea92b3ffb1ff41b02be37007e

2018-03-07 05:04:48 +00:00

..

java

Merge "Fix javadoc typo causing broken links" into oc-mr1-dev am: ac2cdc0dba am: 655d98bdb5

2018-03-07 05:04:48 +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