tree 52eebbd9f4189d30cfe6dc050dc15f1d92774e42
parent 18ecea398657844157cc194213eb5bede2157ee9
parent ca96e25c5b21947fef1f500cc9b12d327aa161a8
author Allen Hair <allenhair@google.com> 1467135917 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467135917 +0000

Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev