tree c84569f32fac93450501648ef4e67b3098038dba
parent 25a6c4cb469afbec79d1c6dda258a3efae80ddb6
parent c8055484aac0d002d00140b789711414f4130428
author Paul Duffin <paulduffin@google.com> 1484044645 +0000
committer android-build-merger <android-build-merger@google.com> 1484044645 +0000

Remove DisableOnDebug (new in 4.12) as it is not supported on Android
am: c8055484aa

Change-Id: Ib56d7246b8e7cfe45b7c175657f80fdb1d725fca