tree 47ef0e141a9f872a0a4129fec79c685b3327e55a
parent e9e7fcf327350f97429ff8d656b67325acbe66d3
parent 345f3505404b55ea0e3958eda6dd46990bcb30eb
author Tao Bao <tbao@google.com> 1510787171 +0000
committer android-build-merger <android-build-merger@google.com> 1510787171 +0000

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

Change-Id: I95cf7f4af44c8abc2ced807e0a3a2fb063448fc1