tree 74f8a55bd37e78f3507092af60f3d2caf3a1edcb
parent de15a3b3d485948af3d8cda30c2844f7a141e401
parent 120d35cf4554bc51ae6c6bef5721683115167a61
author Android Build Merger (Role) <android-build-merger@google.com> 1461000415 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461000417 +0000

Merge "Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: c25b1e1" into nyc-mr1-dev-plus-aosp