Merge "Handle errors on getCapabilities" into oc-mr1-dev
tree: 5238f417f6603850a59d82c4275bc5d6cccb3be4
  1. nn/
  2. Android.bp