OSDN Git Service

Merge changes from topic 'configstore' am: e3a0c607cd am: fb64badb3e
authorJaesoo Lee <jaesoo@google.com>
Tue, 14 Mar 2017 06:59:40 +0000 (06:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Mar 2017 06:59:40 +0000 (06:59 +0000)
am: e0ca61a6be  -s ours

Change-Id: I12c920d8b2e1a1734c822d3badc4195dee82bcfc


Trivial merge