OSDN Git Service

Merge "Legacy channels say "allow sound" instead of "let the app decide". We had...
authorAlison Cichowlas <asc@google.com>
Thu, 31 Aug 2017 20:10:19 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 20:10:19 +0000 (20:10 +0000)
am: 49d25a0506

Change-Id: I3cd8b74fd35dbbdb73512a15f368a527119a9c20

1  2 
res/values/strings.xml

Simple merge