| commit | e468747115da8a027a5b782fd2fa88547043b3ed | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Tue Jun 06 08:01:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 08:01:41 2017 +0000 |
| tree | f8fade4ed42c05d69fa3c3aa82fde0c883dbd479 | |
| parent | e2018a407ac94341de7e842fb646bd099edacb2a [diff] | |
| parent | de30ee2d40a30fadd1fbe7ca8ee89b7b72e27fda [diff] |
Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d