tree 1cdf1215721aa7cff9ff6386a1cc8c8436624c12
parent 60ee0268496d3e73f4f33dffe64cace0da104ca4
parent 97a4750098f95e87bdc29686159ea3df67d71b64
author Tao Bao <tbao@google.com> 1510787258 +0000
committer android-build-merger <android-build-merger@google.com> 1510787258 +0000

Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540
am: 97a4750098

Change-Id: I5b8199d02212b0b2283e647effa3b1829704e27c