am 46679c1d: am 8d35442b: Merge "fix windows build"

Browse Source

* commit '46679c1dce8dff027e1f87acb9bcfc81c0613721':
  fix windows build

...

This commit is contained in:

Kenny Root 2014-09-16 18:20:08 +00:00 committed by Android Git Automerger

parent 0a19c517b7 46679c1dce

commit ebae1bfeaa

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