tree bc121ad22eb9f37d57d8acbbca231e5fc4350938
parent dcaffa653b85f3ba59b7dec9a7e4588f4242857f
parent a6284188ca87579db7292536ebd674e9c921975b
author Brad Ebinger <breadley@google.com> 1529531108 -0700
committer android-build-merger <android-build-merger@google.com> 1529531108 -0700

[automerger skipped] Merge "Default to slot 0 when no subs for testing" am: 63df3cae19  -s ours
am: a6284188ca  -s ours

Change-Id: I663bcb40b1b65598963a1818f68c248bb8b66d8a