am 25e234f1: am f456d32d: (-s ours) am d7007cd4: Merge "Forward compatibility patch."

* commit '25e234f11ae93b3c882694f0d7ec1d4526ed7526':
  Forward compatibility patch.
am 0385ec0c: am 25e234f1: am f456d32d: (-s ours) am d7007cd4: Merge "Forward compatibility patch."

* commit '0385ec0cacf79972a21ddb7e76bd11c7f23177fe':
  Forward compatibility patch.
egl: Reintroduce eglGetRenderBufferANDROID

eglGetRenderBufferANDROID was removed as it had no users. This commit
reintroduces this extensions as it's used by Qualcomm graphics HAL.

Change-Id: I493306830a0d4f8722a42bcc84fb49236afdabeb
am 525705c8: Merge "Eradicate DisplayID." into jb-mr1-dev

* commit '525705c88f91e46099970491282944d4ef0041d4':
  Eradicate DisplayID.
am c477ea1a: am 525705c8: Merge "Eradicate DisplayID." into jb-mr1-dev

* commit 'c477ea1a95ffe7a784c5569899d61c7a80a9a692':
  Eradicate DisplayID.
am 55801e41: we were not always clearing the screen properly

* commit '55801e41e6d7306d75d8134dd69d7d8cbbfbc63c':
  we were not always clearing the screen properly
am 0596dc83: am 55801e41: we were not always clearing the screen properly

* commit '0596dc8301118e6f0a78e558e11afcea0023b8dd':
  we were not always clearing the screen properly
am 7e7ed7f7: the layer list per display could contain non-visible layers

* commit '7e7ed7f77a3963a3542bde529d2797a239e2798b':
  the layer list per display could contain non-visible layers
am cacb4d30: am 7e7ed7f7: the layer list per display could contain non-visible layers

* commit 'cacb4d300b3bf87ee7a1aa2bcb9a24257571c7fe':
  the layer list per display could contain non-visible layers
am b82af2a8: Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev

* commit 'b82af2a8aec99faf6fd37d202b98224cee461a12':
  A vendor ril depends on a native screen shot code.
am 8f86ff79: am b82af2a8: Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev

* commit '8f86ff7967d8cb222287d4ac0806fcbd1ce33084':
  A vendor ril depends on a native screen shot code.
am c1396dd1: Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev

* commit 'c1396dd14506d29e92fc047141d62b3d9246a72d':
  initial checkin of a preliminary HDCP API for vendors to implement.
am 146ea3ee: am c1396dd1: Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev

* commit '146ea3eec4ba08060a60f17c683ba32c177eb736':
  initial checkin of a preliminary HDCP API for vendors to implement.
am c9ea4c8b: Merge "we were sometimes not setting fences properly" into jb-mr1-dev

* commit 'c9ea4c8b580e73a89984641ed37a3eb417cc86c5':
  we were sometimes not setting fences properly
am 3fc6a2ce: am c9ea4c8b: Merge "we were sometimes not setting fences properly" into jb-mr1-dev

* commit '3fc6a2cebc8ea8c71ec9b673b6730d708acc5af7':
  we were sometimes not setting fences properly
am 93997a8a: fix a crasher when setting a display to a null surface

* commit '93997a8a75942b4d06cf50925de5bede489cc134':
  fix a crasher when setting a display to a null surface
am 344d189c: am 93997a8a: fix a crasher when setting a display to a null surface

* commit '344d189cee2e6c5487fb59502777eb33a3bdd22a':
  fix a crasher when setting a display to a null surface
am ec34af41: Merge "Handle new device api version encoding" into jb-mr1-dev

* commit 'ec34af4144c0f990513fe58b0754b20f94b36d6f':
  Handle new device api version encoding
am 066b3d39: am ec34af41: Merge "Handle new device api version encoding" into jb-mr1-dev

* commit '066b3d39a8ba7be8317b7e0f2652934d80368b1f':
  Handle new device api version encoding
am f196b56d: Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev

* commit 'f196b56d70df6af753cb08bbb68e52498f0f37f1':
  Revert "A vendor ril depends on a native screen shot code."