tree ac62e47efd6e795c50dad0a7324417d80d7e6c64
parent 9efdfdb69fd9fd024567e9ca876946fdd6f9ca23
parent 831bd4f0436a81c5ebf9ec4417948b8195cb01d6
author Josh Gao <jmgao@google.com> 1454352844 +0000
committer android-build-merger <android-build-merger@google.com> 1454352844 +0000

Merge changes I93287b87,I30a3eb0b am: d18aea9974
am: 831bd4f043

* commit '831bd4f0436a81c5ebf9ec4417948b8195cb01d6':
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.