tree dd237aaefe8605428dcf4aa5d13c41dcc3b02b35
parent 6deb3d5cf266ce18aefb819c5994f504e0df103b
parent 82eea3fdd77f458e94d87ef0db0bd3b745d096ff
author Narayan Kamath <narayan@google.com> 1424878016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424878016 +0000

am 82eea3fd: Merge "Fix LP64 build for minadbd."

* commit '82eea3fdd77f458e94d87ef0db0bd3b745d096ff':
  Fix LP64 build for minadbd.