tree 18a6c05a038d181c08d803298dd2b8473623c405
parent cb7cdd5053ab37e3b606eb313e8b482a2047091a
parent 54190ec8307ebb83d02b7d9b8edc80a042792de6
author Narayan Kamath <narayan@google.com> 1391078078 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391078078 -0800

am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit