am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries
tree: 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE