tree ecb4f27d8b291fbeab81015f2ad7699fa31e2db3
parent 29ea757f246678ee903a3eeb582410028cf4a0c4
parent 34a717dc539d97a57a7eb7b841a74dde27b9b741
author Jordan Liu <jminjie@google.com> 1494031903 +0000
committer android-build-merger <android-build-merger@google.com> 1494031903 +0000

Merge "Query without a subid uses the default subid" am: 8af31df84b am: 2b4e5037a5
am: 34a717dc53  -s ours

Change-Id: I34cf08a1aa2cc4b598bb5a1924dff6323a85c5fa