diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-05 22:40:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 22:40:19 +0000 |
| commit | 48965bc07b756ae551222f270a3d3054186d5683 (patch) | |
| tree | 6015ffd3940dedacfbaa33ad0a0165358bf35785 /find_java/find_java.exe.manifest | |
| parent | 05cde4d41f10854235174706934549bfb97dac0b (diff) | |
| parent | e50f48d93f311c7143a051e2244d68c9f19507c5 (diff) | |
| download | sdk-48965bc07b756ae551222f270a3d3054186d5683.zip sdk-48965bc07b756ae551222f270a3d3054186d5683.tar.gz sdk-48965bc07b756ae551222f270a3d3054186d5683.tar.bz2 | |
Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933
automerge: e50f48d
* commit 'e50f48d93f311c7143a051e2244d68c9f19507c5':
pixel perfect: Disable controls
Diffstat (limited to 'find_java/find_java.exe.manifest')
0 files changed, 0 insertions, 0 deletions