tree 3bf12b6559625fc2d3bc53c75af672750584d3e6
parent e0d147fb52e3b9239e34c7f7219712aefa8e90ae
parent 1bb7f5f579f5f6d7c40bc9a26cbd85f57fc7cab8
author Josh Gao <jmgao@google.com> 1481782560 +0000
committer android-build-merger <android-build-merger@google.com> 1481782560 +0000

Merge "adb: don't require adb keys to be named "*.adb_key"."
am: 1bb7f5f579

Change-Id: I0a1463180019960e92fbd3c06befcdc3c182f261