tree 2ccd35418437142c5f6d07ae1c56cfca2d732a7b
parent 51265b64a01abfd14804d0b9a0c92c1ca8725317
parent aaa7c08cfa785f7723ea2c4851faa7fab391d96b
author Elliott Hughes <enh@google.com> 1466137166 +0000
committer android-build-merger <android-build-merger@google.com> 1466137166 +0000

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

Change-Id: I331002cbe7a01841600cfd2162772f9f343b4fdf