tree ae7c8471d4c48b835f67a979f45dd5025b6c5c3c
parent f4ade58b3eb24c20337ba9608a4b2008fb4a017d
parent ddb76c4644756b31be948d70aaa8ee541dd94999
author Kenny Root <kroot@google.com> 1291848382 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291848382 -0800

Merge "Change assets to use 64-bit API"