tree d6d5fc91ee67d127e63223782ad10bdf7b4af3ed
parent fd9491c5ea82e91d0085679caa82195bb5b4d17b
parent b210a9f9c7ae17e2028a86d9a4e9a3b35472862a
author Elliott Hughes <enh@google.com> 1342656890 -0700
committer android code review <noreply-gerritcodereview@google.com> 1342656890 -0700

Merge "Use uintptr_t for cast pointer to integer."