| commit | 1f44c26b1eb46503de995735d093e00d8ff9d712 | [log] [tgz] |
|---|---|---|
| author | Allen Hair <allenhair@google.com> | Tue Jun 28 17:45:17 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 28 17:45:17 2016 +0000 |
| tree | 52eebbd9f4189d30cfe6dc050dc15f1d92774e42 | |
| parent | 18ecea398657844157cc194213eb5bede2157ee9 [diff] | |
| parent | ca96e25c5b21947fef1f500cc9b12d327aa161a8 [diff] |
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev