tree 1602257ea6bbf7080df8a4f7de1267e3baa01e8f
parent 7eb60efa8d9a79e20b71a4efeb4c758cbe891776
parent a49c8a19dab9f754521af8a3d9c1787ee588189f
author Elliott Hughes <enh@google.com> 1466136637 +0000
committer android-build-merger <android-build-merger@google.com> 1466136637 +0000

Merge \"Minor minadbd cleanup.\"
am: a49c8a19da

Change-Id: Ie69f3c7d96292ad16f888fc63ee40bcd7c900a09