tree 4930f3780725a5e51b83ff16fb1f8a4ed37a6ddc
parent 93110c767f7664652e093738a087e4cf6b21ea67
parent 98c97c893252094bf118fb436fe92950148f120d
author Elliott Hughes <enh@google.com> 1466136820 +0000
committer android-build-merger <android-build-merger@google.com> 1466136820 +0000

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

Change-Id: I416ad29724fa5975195ea55c17e4fe1e1495285f