tree d3c485476c5e0eefe3e9378a48db6b7f3bd07e02
parent e404f5d9c85bf9b588d72c24002c2277ebf6bc94
parent b8f33fdf5f0d3a57da753aba2077dd8be3f12bbb
author Dan Shi <dshi@google.com> 1490888833 +0000
committer android-build-merger <android-build-merger@google.com> 1490888833 +0000

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

Change-Id: Ifa25165e3b03d49cfb4b5e6b0af14e1059837022