OSDN Git Service

am 9a3dcdea: am 0eb96d64: Merge change 24047 into eclair
authorRaphael <raphael@google.com>
Sat, 5 Sep 2009 01:00:37 +0000 (18:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Sep 2009 01:00:37 +0000 (18:00 -0700)
commit9666e6d35f0512cbe434c4b0c70740bf37307986
tree51bb9ba38486d1c10e5c70cd5092f813eeb9197b
parent4d213c4ed69509e2bb0e018caf1091f564161b49
parent094c6787843be085728249a8166afefa55de1a6d
am 9a3dcdea: am 0eb96d64: Merge change 24047 into eclair

Merge commit '9a3dcdea2fe5e5e785f39b57abaaa86d98a8b6bd'

* commit '9a3dcdea2fe5e5e785f39b57abaaa86d98a8b6bd':
  ADT: fix an NPE that can happen when an XML file resource is being