OSDN Git Service

Merge changes from topic 'vrflinger-prep' into oc-dev
authorCorey Tabaka <eieio@google.com>
Fri, 7 Apr 2017 16:53:30 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 16:53:30 +0000 (16:53 +0000)
am: 5bbb45e038

Change-Id: I34f55f64375479fbb4dcfa176b6ffa6deee141e4


Trivial merge