tree e657bddbb6aec57fda038a2c41751ab6253f8c99
parent b92aee4e8c3d93235c9a57afa81711383538f54f
parent 63e43ba56a95708c229eec539a544967f1bbb7d7
author Jean-Baptiste Queru <jbq@google.com> 1330030623 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330030623 -0800

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

* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries