tree 68050977d52f57f6b4afc421967d40494b14fede
parent 7eddd5855ece2600e175b9918446ed5a62547579
parent b2b4ee3ea2e61f5a92c0e4fa6fd167f848748446
author Hall Liu <hallliu@google.com> 1519336823 +0000
committer android-build-merger <android-build-merger@google.com> 1519336823 +0000

Merge "RTT bugfixes, part 5" am: 76e665ba05
am: b2b4ee3ea2

Change-Id: Ibb67cff0a636204a98074addb62126c42b59bebb