am c514bacb: Merge "Don\'t use SkPicture for DrawText recording" into jb-mr1-dev

* commit 'c514bacb0f4890026568d104f85ebba563bbe930':
  Don't use SkPicture for DrawText recording
am b1f6b188: Reconcile with jb-mr1-release

* commit 'b1f6b1885edf2df16b47fed92ad29c39d626fd01':
am 81730a4f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '81730a4f5b38d20a227012b7023e0f4bd5151371':
Allow numeric entry fields to have placeholder text.

 Bug 6712551

Change-Id: I0e43bb223dc2646d6d78f6135f502b75066e6449
am 89a6e505: am d9779adc: Switch GraphicsOperation to LinearAllocator

* commit '89a6e5053e990e0977f67ade4ff6684938f5afe7':
  Switch GraphicsOperation to LinearAllocator
am 9a84e528: am 74d16a76: Memory cleanup

* commit '9a84e528024f7f944ff5b9d2d28539d0ea7c013a':
  Memory cleanup
Merge "Allow numeric entry fields to have placeholder text."
am ab176313: am 887267ba: Fix PicturePile size adjust path

* commit 'ab17631320ed00fae606f6eba0969ceb83559b34':
  Fix PicturePile size adjust path
am 1f3ede9c: am 95e32410: Optimize recompute bounds checks

* commit '1f3ede9c94d32a4d9604499a6a1995f631ded126':
  Optimize recompute bounds checks
am 22e467fc: am 7b227cf2: Fix build by adding missing #include.

* commit '22e467fcbbf5aed395880faa01f5976729d670c4':
  Fix build by adding missing #include.
am ae5704e5: am f0ad26a9: Merge "Tweak shadow settings" into jb-mr1-dev

* commit 'ae5704e5d67caa1a13d68d3dd9438ac5f4f89a1f':
  Tweak shadow settings
am f1d82a9d: (-s ours) am 3fe9241d: DO NOT MERGE. Allow numeric entry fields to have placeholder text.

* commit 'f1d82a9dc25cc7196390eff2c343f24c96b6bca7':
  DO NOT MERGE. Allow numeric entry fields to have placeholder text.
am 0d027519: am 6228f161: am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendered black"

* commit '0d027519802f1d6f6f5290be25ba0faf5e6e5953':
  Fix browser rendering issue: pure color tiles are rendered black
am 24d4bd10: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '24d4bd10da6bf919fdf855cf1707648205866c59':
am 89a42891: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '89a42891d16d3acd49995ee937b84c46736ca975':
am 76882e89: am 3718b58e: Remove usages of getCanvas

* commit '76882e8904f7d2f7f20417cfe988530e17c82441':
  Remove usages of getCanvas
am e007f772: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e007f77254a6e7b2af8938331b49e0dbd8ae7c2f':
am 32a0a227: am a78491ed: Add extra null check

* commit '32a0a227c211119a6655615bee1adf0be3a9645b':
  Add extra null check
am 3ba661c2: am ebebc5e5: Merge "Reset cached opacity on shader swap" into jb-mr1-dev

* commit '3ba661c2ee40c0cb01d58966c712184db6eb9ff0':
  Reset cached opacity on shader swap
am 7c998e67: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7c998e67cad51e503f89cfd830ba4e8bd3bf68ab':