tree a570ddb6424237fa3730a5a90d412a28c2f93a42
parent 455a1938ab7328d0f2577fe28f16c2a1bcc895f5
parent 397c7d31dbc82b901a2f1ce0ba271899b4c8f693
author Chih-Hung Hsieh <chh@google.com> 1510625580 +0000
committer android-build-merger <android-build-merger@google.com> 1510625580 +0000

Merge "Use -Werror in frameworks/native/libs/vr" am: 79ce1748ea
am: 397c7d31db

Change-Id: If99d869b0bd87a695c2683c676e06eaf02c9c847