tree 3c06ee552ee7b5841817f58ddfd724ed4fed5513
parent 7bca5145a8f13319d49619bf29845008676c0bdb
parent 786012b229cfc46f78aa1473a3afbb292dd03a4d
author Hall Liu <hallliu@google.com> 1519337491 +0000
committer android-build-merger <android-build-merger@google.com> 1519337491 +0000

Merge "RTT bugfixes, part 5" am: de3eeac84d am: 69b0d8bc97
am: 786012b229  -s ours

Change-Id: Ifb2e1384a935046b3272d05b2707a63b5e75b734