tree 569639c998ff096d7167d345e27ced9465620d77
parent 3b272c7bf8514a0c87c04d9e409adbdd8c7674cf
parent 9d13bc216033cbe1a6d1b42579988c30990325ea
author Josh Gao <jmgao@google.com> 1489045862 +0000
committer android-build-merger <android-build-merger@google.com> 1489045862 +0000

Merge "adb: append the libwinpthread COPYING to adb's NOTICE." am: c1b3c8ef26
am: 9d13bc2160

Change-Id: Icc6f177ecf40435e0cef354832152aec3169173f