| commit | d1a8309b44e3a22528d682389e470aea0c648a15 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Fri May 23 18:22:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 18:22:19 2014 +0000 |
| tree | a2079893eb7ddb7de6ed655e4639d044cfe778ab | |
| parent | dded89c1beb880b8ac6286ffdffdaaf59faa34cb [diff] | |
| parent | f61e5d37f6cad98004a50d060cdab24caabb90f8 [diff] |
am f61e5d37: merge in master-release history after reset to ec0df8cc31f6aa86c32bd3c24ba94a8a068f9242 * commit 'f61e5d37f6cad98004a50d060cdab24caabb90f8': Fix win_sdk build. Merge "Fix gles3jni build with clang at android-11"