tree b581995c0649d1d040118192efb3f2d43ebe996b
parent 9e124ddf09d46c0e1d0394f85deac545eab53bd3
parent 801066a2b8dc1545cba6b6e16218b2f1a806e93d
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