tree 09bb46a95db5275471a662af72f32639a21e245e
parent 451ff596cfb2b79ca9494c67d93b43c99d7500d8
parent fcb6c7425d7fe4e590e5559d494310afce16f417
author Mark Salyzyn <salyzyn@google.com> 1517888193 +0000
committer android-build-merger <android-build-merger@google.com> 1517888193 +0000

Merge "base: adb.exe build error" am: 6760466063
am: fcb6c7425d

Change-Id: Idb430e984e0ae1473c236e513d0e7de72a88a5d2