tree f2ba8819f618a6a93aa41df784ae6e47f9859921
parent 4c4a172ee911bb9e76414267168b816399f38755
parent b85983045090df17c02167046112b787b4d7d022
author Josh Gao <jmgao@google.com> 1471036917 +0000
committer android-build-merger <android-build-merger@google.com> 1471036917 +0000

Merge "Clean up key handling in adb."
am: b859830450

Change-Id: I8d8ff82167a97e89eacbfcc97f3b704466927aa3