OSDN Git Service

Merge "Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3...
authorPaul Duffin <paulduffin@google.com>
Thu, 22 Jun 2017 20:50:34 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 20:50:34 +0000 (20:50 +0000)
commit60184293e10d4cf8474b5e5c247c105b3519fc4f
tree9fecf96f52111e5857f22fae932575ee81375035
parente0e4324d49ae73fc7b73f06f6f2e82ef9def0411
parent989b7db027647b2e385d86a9b28fec49aa777a3e
Merge "Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3 am: e211119fea" into oc-dr1-dev-plus-aosp
am: 989b7db027

Change-Id: I1e3bcb0b3607464ab2267c14ff2e8dcd96a19f56