tree cae4e105fb8d9f87c95d40a2baa0456c12eecdf6
parent c13a6a2c94ac033582e2cc7716354b9d079281a6
parent d174434fbf6fbfce54f7eabaa54b8296f55527b8
author David 'Digit' Turner <digit@google.com> 1405091503 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1405022989 +0000

Merge changes I5fc0f53f,If810fe10,Ie3f03d96,I59c1c4fc

* changes:
  android-constants.c: Move constants to single file.
  main-common.h: Add reassign_string().
  android/: Add proper C++ inclusion guards.
  android/avd: Add proper C++ inclusion guards.