Anthony Stange 44b04655e5 Merge "Add scan background mode to Settings.Global." am: 3aa064897e am: 4061a9f348 ...

am: 5dd917de9f

Change-Id: Ib7fa9d8bafc273b6d455a15dd4d5a685010979b3

2018-03-16 20:06:24 +00:00

..

java

Merge "Add scan background mode to Settings.Global." am: 3aa064897e am: 4061a9f348

2018-03-16 20:06:24 +00:00

jni

Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev am: 71ed54f377

2018-03-16 16:35:55 +00:00

proto

Merge "Fix privacy tags based on PWG review meeting." into pi-dev

2018-03-16 18:18:11 +00:00

res

Merge "Update USB charging strings" into pi-dev am: f836c8940a

2018-03-16 04:32:49 +00:00

tests

Merge "Add scan background mode to Settings.Global." am: 3aa064897e am: 4061a9f348

2018-03-16 20:06:24 +00:00