Pavel Maltsev ca380037bd Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp ...

am: 358c593f33

Change-Id: Icdec916c2ef8990884764a713277a6999bd817b6

2018-05-31 12:50:26 -07:00

..

java

Merge "Protect usage data with OP_GET_USAGE_STATS."

2018-05-31 19:21:14 +00:00

jni

Merge "Remove dead code"

2018-05-31 16:48:08 +00:00

proto

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev am: 9d19487b1c

2018-05-25 19:57:10 -07:00

res

Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp

2018-05-31 12:50:26 -07:00

tests

Merge "Supress text replacement spans for ellipsis"

2018-05-31 19:03:31 +00:00