tree 258ca8bfc2bca20c9ea870e6e7c9e1ee68a9a665
parent aa7ad88384be510ce2ed475adf81babe6271877c
parent 695e6d1eac0bff93dd001af642b8c5cf25bd965f
author Elliott Hughes <enh@google.com> 1362008752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362008752 +0000

am 695e6d1e: am 3e93a511: Merge "use longs instead of ints to store pointers in ExpatParser"

* commit '695e6d1eac0bff93dd001af642b8c5cf25bd965f':
  use longs instead of ints to store pointers in ExpatParser