aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f9a43730: Merge "Update easymock version to 3.3" into studio-1.3-dev ↵Siva Velusamy2015-04-071-1/+1
|\ | | | | | | | | | | | | automerge: 1765a16 automerge: eb034a7 * commit 'f9a43730066cafd05fbc11c9fbcea5a2e48d8658': Update easymock version to 3.3
| * Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16Siva Velusamy2015-04-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | automerge: eb034a7 * commit 'eb034a75e79556e0fe8b25453b422b2901a3b853': Update easymock version to 3.3
| | * Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1765a16 * commit '1765a16a16ac2d98465926990e2478665eede3da': Update easymock version to 3.3
| | | * Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | | |\
| | | | * Update easymock version to 3.3Siva Velusamy2015-04-061-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: Ic34fe3940f5514b19a52fc3e5046cce8cd6ec3ce
* | | | am e6aac48c: Merge "Move to the new LayoutlibCallback." into studio-1.3-dev ↵Deepanshu Gupta2015-04-021-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | automerge: 80e3ce8 automerge: bd79a42 * commit 'e6aac48c7da09c20abcafba8ab003848aa8448bc': Move to the new LayoutlibCallback.
| * | | Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: ↵Deepanshu Gupta2015-04-021-4/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e3ce8 automerge: bd79a42 * commit 'bd79a42f7f0759858321a930c9faed6140ae85f2': Move to the new LayoutlibCallback.
| | * | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | automerge: 80e3ce8 * commit '80e3ce8bd4f4daf0c64de75f99e0d6bec06cbcba': Move to the new LayoutlibCallback.
| | | * Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | | |\
| | | | * Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LegacyCallback will be removed shortly. The change moves to the new LayoutlibCallback. Also implement the newly added supports() method. Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
* | | | am 34642d1d: am 52163238: Merge "Update Windows SDK build to track change ↵Kenny Root2015-03-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from OpenSSL to BoringSSL" * commit '34642d1d63c784ae9fd3fe123143d0b3f0773932': Update Windows SDK build to track change from OpenSSL to BoringSSL
| * | | am 52163238: Merge "Update Windows SDK build to track change from OpenSSL to ↵Kenny Root2015-03-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BoringSSL" * commit '52163238a89bce7761408a513287d3f252c67ae6': Update Windows SDK build to track change from OpenSSL to BoringSSL
| | * \ \ Merge "Update Windows SDK build to track change from OpenSSL to BoringSSL"Kenny Root2015-03-061-0/+1
| | |\ \ \
| | | * | | Update Windows SDK build to track change from OpenSSL to BoringSSLBrian Carlstrom2015-03-061-0/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Icc15093be8f0f701c3b67599667f5296e1ac8031
* | | | | am fd23b30d: am 919b6c2b: am b152c0e7: am 3a4699ee: am 4aaaae0d: am ↵bohu2015-02-180-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am 919b6c2b: am b152c0e7: am 3a4699ee: am 4aaaae0d: am 50f3a088: am ↵bohu2015-02-180-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ am b152c0e7: am 3a4699ee: am 4aaaae0d: am 50f3a088: am 55fd7dc9: am ↵bohu2015-02-170-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ \ \ am 3a4699ee: am 4aaaae0d: am 50f3a088: am 55fd7dc9: am 4ea6a758: am ↵bohu2015-02-170-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16 * commit '3a4699ee8d39659a548d40990e89fdf9eb63bf1a': back port gles fix to api 16
| | | | * \ \ \ am 4aaaae0d: am 50f3a088: am 55fd7dc9: am 4ea6a758: am 90ae7159: am ↵bohu2015-02-170-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a88b03e1: am d8166872: (-s ours) back port gles fix to api 16 * commit '4aaaae0de4b110673be9aff0337da9f84c0af5f1': back port gles fix to api 16
| | | | | * \ \ \ am 50f3a088: am 55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am ↵bohu2015-02-170-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8166872: (-s ours) back port gles fix to api 16 * commit '50f3a08874bc8794159395dcdcc71e144b03bba9': back port gles fix to api 16
| | | | | | * \ \ \ am 55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) ↵bohu2015-02-170-0/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back port gles fix to api 16 * commit '55fd7dc90d1300833413b4f7a8dc5ee8f4b1b204': back port gles fix to api 16
| | | | | | | * \ \ \ am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles ↵bohu2015-02-170-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to api 16 * commit '4ea6a758063fbeb61a08a274796beec888596fce': back port gles fix to api 16
| | | | | | | | * \ \ \ am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90ae715989ab46e20728df1b4614a94166193545': back port gles fix to api 16
| | | | | | | | | * \ \ \ am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a88b03e155d2600122083726653b10a4eb90d2c8': back port gles fix to api 16
| | | | | | | | | | * \ \ \ am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd81668725d81d6b3020b08e6fbc72acf3dc1c0c8': back port gles fix to api 16
| | | | | | | | | | | * | | | back port gles fix to api 16bohu2015-02-0313-61/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | am ba367d5e: Merge "Revert "Add targetPlatform for executable binaries"" ↵Xavier Ducrohet2015-02-134-55/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.2-dev automerge: 2c05810 automerge: 3b7b0b5 * commit 'ba367d5ec3aff467df7aca294dc42ac3b95f5c8a': Revert "Add targetPlatform for executable binaries"
| * | | | | | | | | | | | | | Merge "Revert "Add targetPlatform for executable binaries"" into ↵Xavier Ducrohet2015-02-134-55/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev automerge: 2c05810 automerge: 3b7b0b5 * commit '3b7b0b509b4077688f38f3eab3e80e0db19dc643': Revert "Add targetPlatform for executable binaries"
| | * | | | | | | | | | | | | Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-134-55/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2c05810 * commit '2c0581045e20439c54ff5aec76681e4429389f8b': Revert "Add targetPlatform for executable binaries"
| | | * | | | | | | | | | | | Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-124-55/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Revert "Add targetPlatform for executable binaries"Xavier Ducrohet2015-02-124-55/+60
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.
* | | | | | | | | | | | | | | am 1d8f0243: Merge "Add targetPlatform for executable binaries" into ↵Raymond Chiu2015-02-104-60/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev automerge: f7757fb automerge: 95fc762 * commit '1d8f0243a3c2730f8a33db8e9db957369a818d53': Add targetPlatform for executable binaries
| * | | | | | | | | | | | | | Merge "Add targetPlatform for executable binaries" into studio-1.2-dev ↵Raymond Chiu2015-02-104-60/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f7757fb automerge: 95fc762 * commit '95fc7621288e7bd695b41a8b0c4ec589d94c86d8': Add targetPlatform for executable binaries
| | * | | | | | | | | | | | | Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f7757fb * commit 'f7757fbc3e2361e3f3dfad355ed5f82397fb55d5': Add targetPlatform for executable binaries
| | | * | | | | | | | | | | | Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Add targetPlatform for executable binariesRaymond Chiu2015-02-104-60/+55
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make dsl changes due to gradle update. Change-Id: I65729783f5c8f985ed31a231e7dd9a0b9e50f7b3
* | | | | | | | | | | | | | | am 8ab5c13b: Merge "pixel perfect: Disable controls" into studio-1.1-dev ↵Tor Norbye2015-02-051-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b234933 automerge: e50f48d automerge: 48965bc * commit '8ab5c13b8161ecb1dab460b8b2b9020f17eef790': pixel perfect: Disable controls
| * | | | | | | | | | | | | | Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: ↵Tor Norbye2015-02-051-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b234933 automerge: e50f48d automerge: 48965bc * commit '48965bc07b756ae551222f270a3d3054186d5683': pixel perfect: Disable controls
| | * | | | | | | | | | | | | Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933Tor Norbye2015-02-051-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e50f48d * commit 'e50f48d93f311c7143a051e2244d68c9f19507c5': pixel perfect: Disable controls
| | | * | | | | | | | | | | | Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-051-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b234933 * commit 'b234933dc60c7c85db36156b74b6e2c49b2ee9a9': pixel perfect: Disable controls
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-031-3/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | pixel perfect: Disable controlsSiva Velusamy2015-02-031-3/+5
| | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for https://code.google.com/p/android/issues/detail?id=69199 Change-Id: Id90b589dafc02157196e16bbf65beebeb3d57178
* | | | | | | | | | | | | | | | am ad4387f2: Merge "Update Eclipse plugin to handle new LocaleQualifier API" ↵Tor Norbye2015-02-0516-452/+439
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.2-dev automerge: 9042534 automerge: 05cde4d * commit 'ad4387f29d09fd900b12435a3a45b4d5b6bb85e8': Update Eclipse plugin to handle new LocaleQualifier API
| * | | | | | | | | | | | | | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into ↵Tor Norbye2015-02-0516-452/+439
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev automerge: 9042534 automerge: 05cde4d * commit '05cde4d41f10854235174706934549bfb97dac0b': Update Eclipse plugin to handle new LocaleQualifier API
| | * | | | | | | | | | | | | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into ↵Tor Norbye2015-02-0516-452/+439
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev automerge: 9042534 * commit '9042534a2f70c86840c8594c280594f2c4c916bd': Update Eclipse plugin to handle new LocaleQualifier API
| | | * | | | | | | | | | | | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into ↵Tor Norbye2015-02-0416-452/+439
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.2-dev
| | | | * | | | | | | | | | | | | Update Eclipse plugin to handle new LocaleQualifier APITor Norbye2015-02-0416-452/+439
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d5eaec7e6f61a21b07cf790166d9b6ea8f041db
* | | | | | | | | | | | | | | | am 889c6f76: Merge "Remove stale scripts" into studio-1.2-dev automerge: ↵Siva Velusamy2015-02-0312-1493/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e5634d automerge: 7c402b6 * commit '889c6f76ed88a8e8eb211bf1b86cf0f25a88487e': Remove stale scripts
| * | | | | | | | | | | | | | | Merge "Remove stale scripts" into studio-1.2-dev automerge: 2e5634dSiva Velusamy2015-02-0312-1493/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7c402b6 * commit '7c402b66d909b4783cb435db8381d30ee4be5fd2': Remove stale scripts
| | * | | | | | | | | | | | | | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2e5634d * commit '2e5634d59af5b7dc367882f6b51d1d23a9c5c794': Remove stale scripts