Google Git
Sign in
android / platform / external / qemu.git / 3fc679759f303bf583c643f26ae236ba2a997a77
commit3fc679759f303bf583c643f26ae236ba2a997a77[log] [tgz]
authorDavid 'Digit' Turner <digit@google.com>Thu Jul 16 11:30:23 2015 +0000
committerandroid-build-merger <android-build-merger@google.com>Thu Jul 16 11:30:23 2015 +0000
tree9901a8bee766ab1c1edd4f66577a0e94dc90a218
parentd55946f4a7c15c723c986fb3f892048558daaede [diff]
parent36c94b804a1956e2a70f94ee78dce4753bda266a [diff]
Merge "android/build: Add support for LOCAL_QT_UI_SRC_FILES." into studio-1.4-dev
automerge: 36c94b8

* commit '36c94b804a1956e2a70f94ee78dce4753bda266a':
  android/build: Add support for LOCAL_QT_UI_SRC_FILES.
tree: 9901a8bee766ab1c1edd4f66577a0e94dc90a218
  1. android/
  2. audio/
  3. backends/
  4. block/
  5. disas/
  6. distrib/
  7. docs/
  8. fpu/
  9. gdb-xml/
  10. hw/
  11. images/
  12. include/
  13. net/
  14. pc-bios/
  15. proxy/
  16. qapi-auto-generated/
  17. qobject/
  18. qom/
  19. scripts/
  20. slirp/
  21. slirp-android/
  22. target-arm/
  23. target-i386/
  24. target-mips/
  25. tcg/
  26. telephony/
  27. ui/
  28. util/
  29. .gitignore
  30. aio-android.c
  31. aio.c
  32. android-configure.sh
  33. android-rebuild.sh
  34. Android.mk
  35. arch_init.c
  36. async.c
  37. block.c
  38. blockdev.c
  39. buffered_file.c
  40. buffered_file.h
  41. build.gradle
  42. Changelog
  43. CHANGES.TXT
  44. CleanSpec.mk
  45. code-profile.c
  46. COPYING
  47. COPYING.LIB
  48. cpu-exec.c
  49. cpus.c
  50. cputlb.c
  51. disas.c
  52. dma-helpers.c
  53. exec.c
  54. feature_to_c.sh
  55. gdbstub.c
  56. gen-charmap.py
  57. gen-skin.py
  58. hxtool
  59. INSTALL
  60. iohandler.c
  61. ioport.c
  62. kvm-all.c
  63. kvm-android.c
  64. LICENSE
  65. log-rotate-android.c
  66. main-loop.c
  67. Makefile
  68. Makefile.android
  69. Makefile.common
  70. Makefile.qemu-launcher
  71. Makefile.target
  72. Makefile.tests
  73. memory-android.c
  74. migration-dummy-android.c
  75. MODULE_LICENSE_GPL
  76. monitor-android.c
  77. NOTICE
  78. offset_layout.py
  79. os-posix.c
  80. os-win32.c
  81. posix-aio-compat.c
  82. qapi-schema.json
  83. qemu-char.c
  84. qemu-log.c
  85. qemu-options.h
  86. qemu-options.hx
  87. qemu-timer.c
  88. README
  89. savevm.c
  90. sys-tree.h
  91. tap-win32.c
  92. tcg-runtime.c
  93. translate-all.c
  94. translate-all.h
  95. vl-android.c