OSDN Git Service

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

Change-Id: I6018aca9d49de7cc485ddceb15263a5d9db87d07


Trivial merge