| commit | 49fd8a24f3118fca979535ff7c71bcb8393d04c8 | [log] [tgz] |
|---|---|---|
| author | Allen Hair <allenhair@google.com> | Tue Jun 28 17:53:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 28 17:53:00 2016 +0000 |
| tree | f45749e11b7ea32fed175bdb882b815e2a4ef562 | |
| parent | bb5454b6db5770f0b0275424148b2d7d3c52a56d [diff] | |
| parent | 1f44c26b1eb46503de995735d093e00d8ff9d712 [diff] |
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev am: 1f44c26b1e Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216