tree 76d2e3d76e7e443199ead8061b3fb350813dc32c
parent a76807930a93d32a3dbfff1a2392ad9608defc87
parent 57bb313b1e271533a2c97c4105d1f16b8d245cdd
author Dan Shi <dshi@google.com> 1490888983 +0000
committer android-build-merger <android-build-merger@google.com> 1490888983 +0000

Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f
am: 57bb313b1e

Change-Id: I3e9aaedf23d1f3bfbeac9c7afee97993fa14422e