tree 2f54925e72740e65112a1cbe43a19a36db444d0b
parent 4850d463a5da41642665763124c3b8d065461c49
parent 421a39e27102216e1e5bbb5ecb6a7e699f0c970e
author Josh Gao <jmgao@google.com> 1542272931 -0800
committer android-build-merger <android-build-merger@google.com> 1542272931 -0800

Merge "minadbd: track adb C++ version change." am: b67811dd49
am: 421a39e271

Change-Id: I4a346d743d7c54523405433df3fcbe412fa8343c