tree 9de101abb2e6aa22147eb4b0025a50a88c81e01d
parent 9ff67746e60ce9e49d7c21e2af087c081873c544
parent 3dae5ca9d606ae0a55a15aa7a79d46c97c3803ca
author Jeff Sharkey <jsharkey@android.com> 1481411884 +0000
committer android-build-merger <android-build-merger@google.com> 1481411884 +0000

Merge "Remove DEXOPT_OTA flag." am: 8584db972c
am: 3dae5ca9d6

Change-Id: I260245cc751aeea170e849f2520d1ab700ff503b