Kevin Hufnagle 817b77489c Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79 ...

am: 9c43a77971

Change-Id: I920e9f89984245a435edb3c4b28f019d8516c734

2017-08-16 19:26:45 +00:00

..

java

Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79

2017-08-16 19:26:45 +00:00

jni

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094

2017-08-11 20:20:29 +00:00

proto/android

…

res

Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev

2017-08-15 23:50:11 +00:00

tests

Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310

2017-08-16 15:20:59 +00:00