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

Browse Source

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

...

This commit is contained in:

Dan Albert 2014-12-05 18:25:17 +00:00 committed by Android Git Automerger

parent fb81193d44 6efc505bd8

commit a950eb1879

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available