tree 327f30893b5b3dd559229993bff8d4c34d27dc30
parent 4d7bed16ccab670cdf86e8bad863601d2c0ffec5
parent d99bf23127dba88e10e2a330d65478471d9ce9b9
author Brett Chabot <brettchabot@google.com> 1415844992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415844992 +0000

am d99bf231: am a2769edc: Prevent NPE when converting api to xml.

* commit 'd99bf23127dba88e10e2a330d65478471d9ce9b9':
  Prevent NPE when converting api to xml.