OSDN Git Service

Merge "Make sure dvr functions are prepended with dvr" into oc-dev
authorHendrik Wagenaar <hendrikw@google.com>
Wed, 29 Mar 2017 21:06:35 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 21:06:35 +0000 (21:06 +0000)
am: ad0a84fd2a

Change-Id: Ib72c00def4a8d4e43a3873e63744f09854e237a8


Trivial merge