| commit | 1f016493cae26b1beb419b44568281cc1c070f33 | [log] [tgz] |
|---|---|---|
| author | Allen Hair <allenhair@google.com> | Tue Jun 28 18:25:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 28 18:25:43 2016 +0000 |
| tree | bf835281c0f355190b26ba6393ebd909300c4a58 | |
| parent | 00e23a1d8f4f06873a9efc0c1721f31c294da1aa [diff] | |
| parent | 1f44c26b1eb46503de995735d093e00d8ff9d712 [diff] |
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev am: 1f44c26b1e -s ours Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689