commit | 7e92e0cc4b39dd1376418c893cb4f10c5e47db98 | [log] [tgz] |
---|---|---|
author | Paul Duffin <paulduffin@google.com> | Tue Jun 06 16:08:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 16:08:43 2017 +0000 |
tree | 7865016003d8667bb9792aa50ba97049b6770ce2 | |
parent | f40e6bcd2edf0f21141ed1fb1b0c4c7df1d4ed91 [diff] | |
parent | 2fa69bdfcebbd038742347dbadc2d87420724468 [diff] |
Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115 am: 2fa69bdfce -s ours Change-Id: I2559922e3e55d0b64dea38646836fe3ab8ee7fd0