tree 47b1916f669849aa495baac8a3f9e42c0bb5fdb2
parent 95e092228e1a8d306b369f3d402c8def3243b4a9
parent 9d9a55be9d04b478266c597c56ffeae5d1de1a62
author Jeff Sharkey <jsharkey@android.com> 1458659964 +0000
committer android-build-merger <android-build-merger@google.com> 1458659964 +0000

Merge "Only enable asserts on userdebug/eng builds." into nyc-dev
am: 9d9a55b

* commit '9d9a55be9d04b478266c597c56ffeae5d1de1a62':
  Only enable asserts on userdebug/eng builds.