tree b89dec054ade63a429289b10ac987be3f8345f2e
parent 7d8c8dc6d32709c7a03adade47dadf5c13cc3bfa
parent 8904ddb5e3e031097a48dfcf2f94fb16698e546e
author Android Build Merger (Role) <android-build-merger@google.com> 1467307128 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467307128 +0000

Merge "Change default OutputMode to none. am: 6d4519ee21 am: 91eff0693d" into nyc-mr1-dev-plus-aosp