tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 13fd6d8c7bbe2ffc52143b0dc68010258e1fc9e9
parent 2ffe39d2a215a3e442b146b08e4827d487e1d64b
author Jean-Baptiste Queru <jbq@google.com> 1330030919 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330030919 -0800

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

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