tree 4fd0bb5a91f07b59f3c739d42916c704593bc453
parent 683ebdcfe26d4b1b7a078eca4d9589d1e0b1d6b4
parent 5e2526706be97ceee436e6f0b7e6c1c35619b851
author David 'Digit' Turner <digit@google.com> 1399316201 +0000
committer android-build-merger <android-build-merger@google.com> 1399316201 +0000

Merge "Disable 64-bit Darwin platform build." into idea133
 Auto-merge: 5e25267

* commit '5e2526706be97ceee436e6f0b7e6c1c35619b851':
  Disable 64-bit Darwin platform build.
  Add '-accel <mode>' and 'no-accel' options.
  Add misc android/base/ helper classes.
  Windows: Fix libSDLmain compilation