OSDN Git Service

Merge \\\"Always apply config updates.\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21
authorJulia Reynolds <juliacr@google.com>
Fri, 1 Jul 2016 16:23:48 +0000 (16:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 16:23:48 +0000 (16:23 +0000)
am: 005394cd01  -s ours

Change-Id: I45ff9548eb6091ecbcf9e45e0fddb2cbcebc889d


Trivial merge