tree a9f086beaf4298ac4cd0f03d0056392bbf41cf88
parent 5dd3aa70f0bb4b0688cc78b375158343c40ef614
parent d86a742205dbcc4ac7902d9ffce25db1be418902
author Hridya Valsaraju <hridya@google.com> 1475168266 +0000
committer android-build-merger <android-build-merger@google.com> 1475168266 +0000

Merge "Allow various kinds of MQDescriptor."
am: d86a742205

Change-Id: I9b37ba6531b281ed4beb4eeadea6f735bbd4e34e