OSDN Git Service

Merge "Enable notifications during an ongoing call" into oc-dev
authorDaniel Sandler <dsandler@android.com>
Wed, 10 May 2017 15:00:20 +0000 (15:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 15:00:20 +0000 (15:00 +0000)
commit12018312621b37f5e171cb2d5ff5c1bf527f34e0
treed39bd87e1c3452b8ca0dfc0a15ec1f40bdddfd47
parent966f6d716fb6024e38e2e10de964e3e5adda489f
parentb94abe5e30f9be317cee31331e15fa1fab7898fc
Merge "Enable notifications during an ongoing call" into oc-dev
am: b94abe5e30

Change-Id: I9d65601fff941d5a3764cde34f9c658ea1d2a435
core/res/res/values/config.xml
core/res/res/values/symbols.xml