tree d5009816eadc2f25cfaabf253ccc201adeee0863
parent 5475565761ccb9bf75039df63d6eaa92d9d86ea0
parent 62bd0a9cb1ed865c4727c174a3d9fedc515b44ad
author Elliott Hughes <enh@google.com> 1466187762 +0000
committer android-build-merger <android-build-merger@google.com> 1466187762 +0000

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

Change-Id: I292fd31cebd3df14fedf83bc591a0a602bf40128