tree 3eb168ecbd102c3edb40757ee660a96c2758f5bd
parent fd0f390869962fb314e39983155372b31be6ff92
parent c03064ea71dba91a8fd94e37fabd401a66b8cc7f
author Jeff Sharkey <jsharkey@android.com> 1405371544 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405363082 +0000

Merge "Fix 64-bit builds." into lmp-dev