OSDN Git Service

Merge "Optionally append managed service approvals" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 17 Aug 2017 00:54:22 +0000 (00:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 00:54:22 +0000 (00:54 +0000)
am: 445a6d42ef  -s ours

Change-Id: I8f4d84a128cbdca8e4a9c9e330765b324569bd1c


Trivial merge