tree 4d92943506140cec84438ce1329c34e074e76ffe
parent bcf8946f1d823d87acedbaf82cd0a3cd7b54599d
parent 1234e50433df6340056a77a4c16621ebd81afef6
author Jordan Liu <jminjie@google.com> 1493346597 +0000
committer android-build-merger <android-build-merger@google.com> 1493346597 +0000

Merge "Query without a subid uses the default subid" into oc-dev am: 6a8d375506
am: 1234e50433

Change-Id: I8d360711c1df20bc0ad13d9e681c2bf52b76f89a