merge in jb-mr2-release history after reset to jb-mr2-dev
merge in master-release history after reset to master
Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
am d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev

* commit 'd77d4e0edcb0d0f99dce2acea5278875be0b02a0':
  Support broadcast when dumpstate finishes.
am 3fa3e385: am d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev

* commit '3fa3e38527320e27c40fbcbc3d53ed68b1442e86':
  Support broadcast when dumpstate finishes.
am 6250f6cb: am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""

* commit '6250f6cb2be039be150de6c836f8595384838342':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
am 801e632a: am 6250f6cb: am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""

* commit '801e632a1913819a7bf8542615caa80018c0f266':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
am 9943b7b9: am 801e632a: am 6250f6cb: am d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""

* commit '9943b7b9a5bfabe5f306f780fc9ab8ba9938a652':
  Revert "Add a compatibility symbol for the MemoryBase constructor."
Increase screenshot timeout.

Devices with large displays take longer than 5 seconds to write.

Change-Id: If74bc4a3cec366ae28eca549bce28ef212e47d8f
Merge "Increase screenshot timeout." into jb-mr2-dev
am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev

* commit 'a11713ce3e81d7838092168fad110bea3212a9f3':
  Increase screenshot timeout.
am a6d94e8d: am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev

* commit 'a6d94e8dfe7a251066b74bb3f3a6722e0c2713b5':
  Increase screenshot timeout.
am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."

* commit '7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
am 5b00af24: am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."

* commit '5b00af2435d67ccf806c918f6482949870fd993b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
am 9bd5c827: am 5b00af24: am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."

* commit '9bd5c8274c822540473dfc646b47b4121785c727':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."

* commit '7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
  Second try at adding a compatibility symbol for the MemoryBase constructor.
fix a couple race-conditions in RefBase::promote()

Bug: 8390295
Change-Id: I7a48e3bf5b213cc1da2b8e844c6bb37ee24cb047
get rid of purgatory and fix QueuesToWindowComposer query

the purgatory list wasn't needed anymore; in fact it had no effect as
buffer life-time management is now handled by the BufferQueue.

For QueuesToWindowComposer we keep a list of wp<> on the IBinder
for IGraphicBufferProducers we hand over to clients so we can
easily check if an IGraphicBufferProducer is ours. We clean-up the
list when our IGraphicBufferProducer are destroyed.

Bug: 8349142
Change-Id: I1aa06652ade8c72d0004a3f5e6c3d6e8a82fc2ae
am 1791eefd: fix a couple race-conditions in RefBase::promote()

* commit '1791eefd69e07a7d8a311ee8a298bbd2de77f046':
  fix a couple race-conditions in RefBase::promote()
am 5f72d05a: am 1791eefd: fix a couple race-conditions in RefBase::promote()

* commit '5f72d05a01d9b7a1bd6d2a2a269b80facd206066':
  fix a couple race-conditions in RefBase::promote()