am 12caef78: am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE
am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev

* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
  Fix RemoteController synchronization mode
am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.
resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aosp

Change-Id: Iba01a6617d4922ec2827b0465095695028c20681
am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
  change Surface constructor arg to 64bit
am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE

* commit 'a3ea4be5425fc2a561290c08a9f5f31f374afc31':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
am 2cd0563c: am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '2cd0563cb8345747d3705d4f339a0800998767fe':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

* commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db':
  Release locked buffer when it fails to acquire graphics buffer
am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"

* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"

* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."

* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.
am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
am e29c96e7: Merge "libexif is now libjhead" into klp-dev

* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
  libexif is now libjhead
am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev

* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
  ProgressBar is important for accessibility by default.
resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp

Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit '430652c1e18c54dc6ae9debedb6394f2f1905903':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev

* commit '98a6bcf433fc23c343343b04c57c5a68d0177ac7':
  ExifInterface: fix class load failure
am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory"

* commit '85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
  Remove DRLCertFactory
am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."

* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.