Anthony Stange 8bde24cf53 Merge "Revert "Add scan background mode to Settings.Global.""

2018-03-16 17:49:12 +00:00

..

java

Merge "Revert "Add scan background mode to Settings.Global.""

2018-03-16 17:49:12 +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 "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev

2018-03-16 10:25:32 +00:00

res

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

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

tests

Merge "Revert "Add scan background mode to Settings.Global.""

2018-03-16 17:49:12 +00:00