OSDN Git Service

Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev am: cbf554b78b
authorRebecca Silberstein <silberst@google.com>
Fri, 22 Jun 2018 18:34:55 +0000 (11:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jun 2018 18:34:55 +0000 (11:34 -0700)
am: 5f5f4788f1

Change-Id: I8a260e47661912420c20634c390aef288afaf92b

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

Simple merge
Simple merge