tree b4091feec8f7ad260ef2f3ccccb47c773cd6fc97
parent c6fced37ea387772bd9544a3b4e6cd29cc636a30
parent be3b1f15c829acf118e8c53c312ff735fa1c5511
author Elliott Hughes <enh@google.com> 1362007637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362007637 +0000

am be3b1f15: am 2970474c: Merge "use longs instead of ints to store pointers in ObjectStreamClass"

* commit 'be3b1f15c829acf118e8c53c312ff735fa1c5511':
  use longs instead of ints to store pointers in ObjectStreamClass