Lorenzo Colitti 20fa45e3a9 Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf ...

am: 0cf31d4d6d

Change-Id: I759ed9a79b6ebfa2ae6143167c0dd7d0ad84c67f

2017-08-15 02:25:36 +00:00

..

java

Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf

2017-08-15 02:25:36 +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 "Add config option to enable/disable pause workaround."

2017-08-14 16:29:04 +00:00

tests

Fix flaky IpPrefixTest.

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