tree c397c6f0d018a564e20e71dd90aed8e360a4cd8f
parent 8d66d58d1d2af6fe19be6ce4e61a951e78a8d5ba
parent c1319fec674fc00cd18396da0688eff1c64cc702
author TreeHugger Robot <treehugger-gerrit@google.com> 1495142618 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495142619 +0000

Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev