OSDN Git Service

Merge "Move strings to SettingsLib so TV can use them" into oc-dev
authorTony Mantler <nicoya@google.com>
Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)
commitea71adb730818a03dbb5a8151e08b2da8cb40f02
treeadc5b62703584f62c9a14cbaab646f558d9d28ac
parentd8895787c919205dc04105f680fbab94e78d6eb3
parent685041559aa840196090039bf040dae9cca2062b
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am: 685041559a

Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00