| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
automerge: 1765a16 automerge: eb034a7
* commit 'f9a43730066cafd05fbc11c9fbcea5a2e48d8658':
Update easymock version to 3.3
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
automerge: eb034a7
* commit 'eb034a75e79556e0fe8b25453b422b2901a3b853':
Update easymock version to 3.3
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
automerge: 1765a16
* commit '1765a16a16ac2d98465926990e2478665eede3da':
Update easymock version to 3.3
|
| | | |\ |
|
| | | |/
| | | |
| | | |
| | | | |
Change-Id: Ic34fe3940f5514b19a52fc3e5046cce8cd6ec3ce
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
automerge: 80e3ce8 automerge: bd79a42
* commit 'e6aac48c7da09c20abcafba8ab003848aa8448bc':
Move to the new LayoutlibCallback.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
80e3ce8
automerge: bd79a42
* commit 'bd79a42f7f0759858321a930c9faed6140ae85f2':
Move to the new LayoutlibCallback.
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | | |
automerge: 80e3ce8
* commit '80e3ce8bd4f4daf0c64de75f99e0d6bec06cbcba':
Move to the new LayoutlibCallback.
|
| | | |\ |
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
LegacyCallback will be removed shortly. The change moves to the new
LayoutlibCallback.
Also implement the newly added supports() method.
Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
from OpenSSL to BoringSSL"
* commit '34642d1d63c784ae9fd3fe123143d0b3f0773932':
Update Windows SDK build to track change from OpenSSL to BoringSSL
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
BoringSSL"
* commit '52163238a89bce7761408a513287d3f252c67ae6':
Update Windows SDK build to track change from OpenSSL to BoringSSL
|
| | |\ \ \ |
|
| | |/ / /
| | | | |
| | | | |
| | | | | |
Change-Id: Icc15093be8f0f701c3b67599667f5296e1ac8031
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
50f3a088: am 55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16
* commit 'fd23b30d5dfaa17b34774de63230d22ca607b39b':
back port gles fix to api 16
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16
* commit '919b6c2bbe5c20514ff37ffd8c0a1e7e961ac176':
back port gles fix to api 16
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16
* commit 'b152c0e78f0193309be0c6673bc54f50a658cb4c':
back port gles fix to api 16
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16
* commit '3a4699ee8d39659a548d40990e89fdf9eb63bf1a':
back port gles fix to api 16
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
a88b03e1: am d8166872: (-s ours) back port gles fix to api 16
* commit '4aaaae0de4b110673be9aff0337da9f84c0af5f1':
back port gles fix to api 16
|
| | | | | |\ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
d8166872: (-s ours) back port gles fix to api 16
* commit '50f3a08874bc8794159395dcdcc71e144b03bba9':
back port gles fix to api 16
|
| | | | | | |\ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
back port gles fix to api 16
* commit '55fd7dc90d1300833413b4f7a8dc5ee8f4b1b204':
back port gles fix to api 16
|
| | | | | | | |\ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
fix to api 16
* commit '4ea6a758063fbeb61a08a274796beec888596fce':
back port gles fix to api 16
|
| | | | | | | | |\ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* commit '90ae715989ab46e20728df1b4614a94166193545':
back port gles fix to api 16
|
| | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* commit 'a88b03e155d2600122083726653b10a4eb90d2c8':
back port gles fix to api 16
|
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
* commit 'd81668725d81d6b3020b08e6fbc72acf3dc1c0c8':
back port gles fix to api 16
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Following CLs are back ported:
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
Change-Id: Ia3c18f714812a8c90593c6a0260c92dc18c56da3
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
into studio-1.2-dev automerge: 2c05810 automerge: 3b7b0b5
* commit 'ba367d5ec3aff467df7aca294dc42ac3b95f5c8a':
Revert "Add targetPlatform for executable binaries"
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
studio-1.2-dev automerge: 2c05810
automerge: 3b7b0b5
* commit '3b7b0b509b4077688f38f3eab3e80e0db19dc643':
Revert "Add targetPlatform for executable binaries"
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|/
| | | |/| | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
automerge: 2c05810
* commit '2c0581045e20439c54ff5aec76681e4429389f8b':
Revert "Add targetPlatform for executable binaries"
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
This reverts commit 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
studio-1.2-dev automerge: f7757fb automerge: 95fc762
* commit '1d8f0243a3c2730f8a33db8e9db957369a818d53':
Add targetPlatform for executable binaries
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
automerge: f7757fb
automerge: 95fc762
* commit '95fc7621288e7bd695b41a8b0c4ec589d94c86d8':
Add targetPlatform for executable binaries
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
automerge: f7757fb
* commit 'f7757fbc3e2361e3f3dfad355ed5f82397fb55d5':
Add targetPlatform for executable binaries
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Make dsl changes due to gradle update.
Change-Id: I65729783f5c8f985ed31a231e7dd9a0b9e50f7b3
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
automerge: b234933 automerge: e50f48d automerge: 48965bc
* commit '8ab5c13b8161ecb1dab460b8b2b9020f17eef790':
pixel perfect: Disable controls
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
b234933 automerge: e50f48d
automerge: 48965bc
* commit '48965bc07b756ae551222f270a3d3054186d5683':
pixel perfect: Disable controls
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
automerge: e50f48d
* commit 'e50f48d93f311c7143a051e2244d68c9f19507c5':
pixel perfect: Disable controls
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
automerge: b234933
* commit 'b234933dc60c7c85db36156b74b6e2c49b2ee9a9':
pixel perfect: Disable controls
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Fix for https://code.google.com/p/android/issues/detail?id=69199
Change-Id: Id90b589dafc02157196e16bbf65beebeb3d57178
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
into studio-1.2-dev automerge: 9042534 automerge: 05cde4d
* commit 'ad4387f29d09fd900b12435a3a45b4d5b6bb85e8':
Update Eclipse plugin to handle new LocaleQualifier API
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
studio-1.2-dev automerge: 9042534
automerge: 05cde4d
* commit '05cde4d41f10854235174706934549bfb97dac0b':
Update Eclipse plugin to handle new LocaleQualifier API
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
studio-1.2-dev
automerge: 9042534
* commit '9042534a2f70c86840c8594c280594f2c4c916bd':
Update Eclipse plugin to handle new LocaleQualifier API
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
studio-1.2-dev
|
| | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Change-Id: I1d5eaec7e6f61a21b07cf790166d9b6ea8f041db
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
2e5634d automerge: 7c402b6
* commit '889c6f76ed88a8e8eb211bf1b86cf0f25a88487e':
Remove stale scripts
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
automerge: 7c402b6
* commit '7c402b66d909b4783cb435db8381d30ee4be5fd2':
Remove stale scripts
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
automerge: 2e5634d
* commit '2e5634d59af5b7dc367882f6b51d1d23a9c5c794':
Remove stale scripts
|