am c9bf3ba4: Merge "Virtual Display async mode is overridden"

* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
  Virtual Display async mode is overridden
am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
am b98c4761: Merge "Correcting include path in installd test project\'s Android.mk"

* commit 'b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
  Correcting include path in installd test project's Android.mk
am 6b4e5b7f: Merge "Fix misuse of ."

* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
  Fix misuse of $(my-dir).
Remove "screenshot"

This is the old screenshot utility, which relies on direct access
to the framebuffer device.  It was replaced a long time ago by
"screencap", which talks to SurfaceFlinger (and includes a fallback
that tries to use the FB dev).

Change-Id: Id75a574bc78033761070b64d528fed06e23a0189
am 61d6a008: Merge "hwc test: 64-bit compilation error"

* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
  hwc test: 64-bit compilation error
am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."

* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
  gui: Fix return code assert in CpuConsumer_test.
am e19c99aa: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"

* commit 'e19c99aad605c395f53bf39ae1a27e298e7e33ce':
  Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
am 3c39e03c: Merge "Don\'t pass in empty arg to dex2oat."

* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
  Don't pass in empty arg to dex2oat.
am 112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"

* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
  SurfaceFlinger: fix 64-bit format string warnings
am 1649c77e: Merge "ART profiler"

* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
  ART profiler
Add sideband streams to BufferQueue and related classes

Sideband streams are essentially a device-specific buffer queue that
bypasses the BufferQueue system. They can be used for situations with
hard real-time requirements like high-quality TV and video playback
with A/V sync. A handle to the stream is provided by the source HAL,
and attached to a BufferQueue. The sink HAL can read buffers via the
stream handle rather than acquiring individual buffers from the
BufferQueue.

Change-Id: Ib3f262eddfc520f4bbe3d9b91753ed7dd09d3a9b
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE

Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
Fix parameter ordering for installd's dex2oat execl.

Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
Merge "Fix parameter ordering for installd's dex2oat execl."
am 9b04f860: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE

* commit '9b04f860f23481d39c3b45379a324d3630966825':
  Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."

* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
  Fix parameter ordering for installd's dex2oat execl.
Merge "BufferQueue: Allow detaching/reattaching buffers"
merge in master-release history after reset to master
VirtualDisplaySurface: no attach/detach support

Change-Id: I630dd6e352940318c33a4e072d2f33a6ec58c556