Merge pie-cts-dev into master.
authorXin Li <delphij@google.com>
Wed, 8 Aug 2018 18:43:04 +0000 (11:43 -0700)
committerXin Li <delphij@google.com>
Wed, 8 Aug 2018 18:43:04 +0000 (11:43 -0700)
commit7a78102df1f85c64b67bdfa008f7236c536cde67
tree61bd446e59f8988dfec8298ff19540e28f5d9708
parentf12b77f7fa2430ebfa315d8b5dcfd314ad5a8a43
parent81bf6013b802ceea60f4b4378aef33f3b3de94c1
Merge pie-cts-dev into master.

Bug: 112051819
Change-Id: Ide79ad146b80a923cfd00ec1e526b8b389e54b29