OSDN Git Service

Merge "Enable notifications during an ongoing call" into oc-dev am: b94abe5e30
authorDaniel Sandler <dsandler@android.com>
Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
commitdf13737efbfd82fce2ec1f95f8e03ec13b14dee1
treee1c8f1802c45e95b109fc784fbd1c26e9a5c5f38
parent2a6343bd92210aab3010dcf16432af619dd5f051
parent12018312621b37f5e171cb2d5ff5c1bf527f34e0
Merge "Enable notifications during an ongoing call" into oc-dev am: b94abe5e30
am: 1201831262

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