Merge "Add all platform fonts to the SDK."
Merge "move platform tools to r8."
am 9a528ed9: Merge "Get rid of libqemu library."

* commit '9a528ed9845694e8fb73d263145786a6f549240d':
  Get rid of libqemu library.
am c6d3e76d: Merge "move platform tools to r8."

* commit 'c6d3e76d5d6112a66c04f9e2fe6c2d610ee8702b':
  move platform tools to r8.
am af0d8ed8: am 9a528ed9: Merge "Get rid of libqemu library."

* commit 'af0d8ed819cf5eaf9b77bde80c0ef87a9d690d5d':
  Get rid of libqemu library.
resolved conflicts for merge of d2819621 to honeycomb-plus-aosp

Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179
Fix size_t definition in x86 NDK header file

Bug: http://code.google.com/p/android/issues/detail?id=19011

The incorrect #define was being used which caused the incorrect
definition for size_t when the standalone toolchain is used.

Change-Id: Ifef4dc987c542a9c5d8bb43d84d3fe1431de9aa0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
am 51fa07e1: am 659943e8: am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"

* commit '51fa07e1dad4c5407c739df71e3e4c8cf8c56e4b':
  GLES2 translaotr: fix glLinkProgram and object names
am 3e06a6c4: am 4045962c: am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"

* commit '3e06a6c4dbafa0f2e2542a2b6175324f218ffa48':
  GLES translator - enable binding to multiple texture targets
am 42f7afd1: am 90b89c58: am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"

* commit '42f7afd1c7db902d57525f09b6f26701b13cde90':
  GLES2 translator: host does not support RGB565
am fa00fd7e: am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""

* commit 'fa00fd7e18dcc15543fd2f12fb2b67c98b84b79c':
  2.0 translator: workaround for nVidia "bug"
am 675845a4: am ecf74d6a: am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"

* commit '675845a4d26c8d718fa3c5a6b53b873c9ae01fc2':
  GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
am dc6e4e64: am af0d8ed8: am 9a528ed9: Merge "Get rid of libqemu library."

* commit 'dc6e4e64de0036021dc4491ab0760d3aeb364019':
  Get rid of libqemu library.
am e4354ba7: resolved conflicts for merge of d2819621 to honeycomb-plus-aosp

* commit 'e4354ba71e9ac21ff4e6864da7287db472c50e84':
  move platform tools to r8.
Show how to use broadcast for accessing voice search settings.

Change-Id: Ie17e377cd1814b58e00a56e8dfb84fc66cd88985
Merge "Show how to use broadcast for accessing voice search settings."
remove NV_WAR defines

enable workarounds by default
added environemnt variable GOOGLE_GLSL_FORCE_GLES_VERSION
to the shader parser

Change-Id: If1dbc10722436659295c40a40bd630a72e575799
1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6

This is a WAR for an ATI OpenGL driver bug.

Change-Id: I0b54317873ed8c60fe835a993c2c8f32321ff8e2
1.1 translator: WAR for GL_ALPHA_TEST_REF bug

Both the ATI and nVidia OpenGL drivers return the wrong answer on
glGetIntegerv(GL_ALPHA_TEST_REF). So Implement this functionality
in our code.

Change-Id: I022b1475f7edb9f1d0f48ebcaf9f6e9f5c4f344e
opengl translator: Added GLSL ES builtin constants.

Adds GLSL built in constants defined in GLSL ES but not in GLSL.
Makes biConstant conformance test to pass on Mac (where ES2_compatability is not
present).

Also fixed the GLSL parser to insert our additions to the shader
only after the "#version" token if exist in the original shader.
Also renamed env var GOOGLE_GLES_FORCE_GLSL_VERSION to
GOOGLE_GLES_DEFAULT_GLSL_VERSION to better match its functionality since
we use it only if no specific version exist in the shader code.

Change-Id: If9485da16da2808245943a7295f8fb22a6f631aa