Merge pie-cts-dev into master.
authorXin Li <delphij@google.com>
Thu, 9 Aug 2018 00:00:06 +0000 (17:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 00:00:06 +0000 (17:00 -0700)
commitd0997637e888dce3c05d636c5acd479b4c5986b5
tree61bd446e59f8988dfec8298ff19540e28f5d9708
parent9b15ede5be6285ae1e8ecd0b656e47149f27ea3d
parent7a78102df1f85c64b67bdfa008f7236c536cde67
Merge pie-cts-dev into master.
am: 7a78102df1

Change-Id: If556ef3962debbccf928f22cab27695ef09bb2e5