tree 29674f3f18ba63345cd6ba0efaf719857207d3be
parent 2c2a845e1e8fdda704e4f2ccaa335d69d043ebf3
parent 86c71ca3796640173f6dd1e205bf111db9230f54
author Colin Cross <ccross@android.com> 1507759707 +0000
committer android-build-merger <android-build-merger@google.com> 1507759707 +0000

Merge changes from topic "junit-soong" am: 9f35e340ac am: a87b7d3237
am: 86c71ca379

Change-Id: Ic60a751a94c52f160eece5bc3542f2ff4449f4d0