tree 336339c91df9091d4905bb7b36340954451b30b4
parent 78f6f9b1f34e543e0806cfb0393e29b1e39ae84f
parent ac8ed5e0893043a91a08e7fbf840fd3eff38a188
author Elliott Hughes <enh@google.com> 1344284115 -0700
committer android code review <noreply-gerritcodereview@google.com> 1344284116 -0700

Merge "Use uintptr_t for cast pointer to integer."