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

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

Change-Id: Ie0a931ef42c853b55dd26a4c9d56898f3617455c
am b1f6b188: Reconcile with jb-mr1-release

* commit 'b1f6b1885edf2df16b47fed92ad29c39d626fd01':
Reconcile with jb-mr1-release - do not merge

Change-Id: I2dbd918d7aa6d7102f372019e45c32054ab3532f
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 d9779adc: Switch GraphicsOperation to LinearAllocator

* commit 'd9779adc025ab665fde1c9983e7793e96ab56d4e':
  Switch GraphicsOperation to LinearAllocator
am 89a6e505: am d9779adc: Switch GraphicsOperation to LinearAllocator

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

* commit '74d16a7661fcde10787bc62b4c62e202c9cc2495':
  Memory cleanup
am 9a84e528: am 74d16a76: Memory cleanup

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

* commit '887267ba11d80d5d04a9a45cda2f3d205ee08acd':
  Fix PicturePile size adjust path
am ab176313: am 887267ba: Fix PicturePile size adjust path

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

* commit '95e32410ffa4f84bc6b140640731bd44c50cee88':
  Optimize recompute bounds checks
am 1f3ede9c: am 95e32410: Optimize recompute bounds checks

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

* commit '7b227cf2e1a760763e73bb4ceccd3125cd120559':
  Fix build by adding missing #include.
am 22e467fc: am 7b227cf2: Fix build by adding missing #include.

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

* commit 'f0ad26a937ebc7c889abf512e2ec83914ccbf01f':
  Tweak shadow settings
am ae5704e5: am f0ad26a9: Merge "Tweak shadow settings" into jb-mr1-dev

* commit 'ae5704e5d67caa1a13d68d3dd9438ac5f4f89a1f':
  Tweak shadow settings
am 3fe9241d: DO NOT MERGE. Allow numeric entry fields to have placeholder text.

* commit '3fe9241dc0b20c68b75847832b8f179c741f4b34':
  DO NOT MERGE. Allow numeric entry fields to have placeholder text.