tree 76b0b093eee06b14f2ce56d8d4d927b04a35159a
parent 97e94154d01815a94ba268aaf83e6265380e508f
parent bb8a897f68600b94c1515717b47e924e3c3e570d
author David Pursell <dpursell@google.com> 1446762236 +0000
committer android-build-merger <android-build-merger@google.com> 1446762236 +0000

Merge "adb: fix device module for non-shell_v2 usage." am: fbc9027558 am: 3aa550644c
am: bb8a897f68

* commit 'bb8a897f68600b94c1515717b47e924e3c3e570d':
  adb: fix device module for non-shell_v2 usage.