am f61e5d37: merge in master-release history after reset to ec0df8cc31

Browse Source

* commit 'f61e5d37f6cad98004a50d060cdab24caabb90f8':
  Fix win_sdk build.
  Merge "Fix gles3jni build with clang at android-11"

...

This commit is contained in:

The Android Automerger

2014-05-23 18:22:19 +00:00

committed by Android Git Automerger

parent dded89c1be f61e5d37f6

commit d1a8309b44

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

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

Diff Content Not Available