am da2f549f: am 2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev

* commit 'da2f549f3b77ee5f04a6f726facb1a091d796054':
  Properly expose methods that override a non-hidden method in a hidden superclass in the API files.