tree 07457eb36c996afdac69e4c65b64db35c614dcdc
parent fb81193d444347e6aa232766687d25057246799a
parent 6efc505bd8dbddf96f9f8f1984196c511d48b3b0
author Dan Albert <danalbert@google.com> 1417803917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417803917 +0000

am 6efc505b: am 09b9193d: Merge "Fix -Werror on 64-bit builds"

* commit '6efc505bd8dbddf96f9f8f1984196c511d48b3b0':
  Fix -Werror on 64-bit builds