OSDN Git Service

Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de
authorPaul Duffin <paulduffin@google.com>
Thu, 1 Dec 2016 10:54:46 +0000 (10:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Dec 2016 10:54:46 +0000 (10:54 +0000)
commitba577753545735870dc215ce44f7353d8b2257dc
tree3ce7f1e4b0e3445360d6b6d4ef68f0fb8dd1fc47
parent06eea4933cd9f5a2f24710af1b66f738c18312a7
parent29a72d0e22cff281ba8f41c83eb9c4c125c4fbd0
Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de
am: 29a72d0e22

Change-Id: Ib3458dfd6bf5bfd646cb24c607ec436f897531df