Neil Fuller 1f368850d8 Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev ...

am: a031b0d6a1

Change-Id: I1a1a6468921ca5e23cc250aacb713153433917a3

2017-08-12 04:00:36 +00:00

..

java

Merge "docs: replaced "i.e." to fix formatting error" into oc-dev

2017-08-11 21:01:15 +00:00

jni

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

2017-08-11 20:12:31 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev

2017-08-12 04:00:36 +00:00

tests

Fix flaky IpPrefixTest.

2017-08-08 14:54:08 +09:00