merge in nakasi-factoryrom-release history after reset to jb-dev
Fix crash on arstechnica

Not checking for cachedImage for the background images...

bug:6482165
Change-Id: I9de5ee9cef446cd07688b40f6b04bdd493e40edd
Merge "Fix crash on arstechnica" into jb-dev
ref count the surface to keep the tiles alive for transfer queue

bug:6317924

Change-Id: If0a56ee48247d924f5a4cbd2dcac2cbb3faf0adb
am 248cd270: Merge "Change selection to work with left/right instead of base/extent." into jb-dev

* commit '248cd27071497cb61def0b07d4fd2dc23af657dd':
  Change selection to work with left/right instead of base/extent.
am 4ef88bec: Merge "Update bounds calculation to use draw transform" into jb-dev

* commit '4ef88beceb0e8d5b2df5bd4e30360ffcb8c2a65d':
  Update bounds calculation to use draw transform
am 55ff9f5a: Defer low res tile rendering to once/second

* commit '55ff9f5ac537f2b11ae997f1029bdccb87008825':
  Defer low res tile rendering to once/second
am 8001929c: Merge "calculate draw transforms before merging layers" into jb-dev

* commit '8001929cfbff025063aab7bd129277b24cf3a9ff':
  calculate draw transforms before merging layers
am eb4dd05c: Merge "Fix crash on arstechnica" into jb-dev

* commit 'eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0':
  Fix crash on arstechnica
Only start or end selection with non-empty text fields.

 Bug 6496951

Change-Id: I5ea68aebe4c3652eae49b20d4c07418725190549
am bbaf943f: ref count the surface to keep the tiles alive for transfer queue

* commit 'bbaf943fc6f340f257b9fce2ec802b1cf2deed36':
  ref count the surface to keep the tiles alive for transfer queue
Merge "Only start or end selection with non-empty text fields." into jb-dev
am 10f686b8: Merge "Only start or end selection with non-empty text fields." into jb-dev

* commit '10f686b8c96114108ebbad4bd86b1810871d54f5':
  Only start or end selection with non-empty text fields.
Account for image scaling in calculating ImageTexture visible area

bug:6494473
Change-Id: I03e72faa0815337b46930dbaeb9062c057aa1e2a
Remove obsolete ThirdPartyProject.prop file.

Change-Id: I5384206c478da146a7fbd5333bfb3227d9c042e4
Merge "Remove obsolete ThirdPartyProject.prop file."
Merge "Account for image scaling in calculating ImageTexture visible area" into jb-dev
am 0a1158eb: Merge "Account for image scaling in calculating ImageTexture visible area" into jb-dev

* commit '0a1158eb7818a67dc70637e282b307d7a5ad4031':
  Account for image scaling in calculating ImageTexture visible area
Allow more layers to be merged.

This will reduce the need to go to single surface rendering mode.

bug:5683630 bug:6499283

Change-Id: I482060b38d856c81ae8eff296e76252892e6a610
Merge "Allow more layers to be merged." into jb-dev