OSDN Git Service

Merge changes from topic 'aia_settings_overlay' into oc-dev am: bd20a7b263
authorChad Brubaker <cbrubaker@google.com>
Mon, 1 May 2017 22:44:35 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 22:44:35 +0000 (22:44 +0000)
am: 2369190543

Change-Id: I09eead06a47aa5f97ba5dfc0a8fd4e68655aa75e

1  2 
core/res/res/values/config.xml
core/res/res/values/symbols.xml

Simple merge
Simple merge