Merge "Move strings to SettingsLib so TV can use them" into oc-dev am: 685041559a

am: ea71adb730  -s ours

Change-Id: Id876c24798a8f1a95e39915be3f6201ac0c9103a
This commit is contained in:
Tony Mantler
2017-06-03 22:05:21 +00:00
committed by android-build-merger

Diff Content Not Available