Reconcile our huevos with aosp/master's face.

Squashed commit of the following:

commit 8124bdd2a797a896f32c56b76d3815d2780ed332
Merge: 371bf38 8ebd20b
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Sun Jan 13 22:41:57 2013 -0500

    Merge remote-tracking branch 'vanir/jb42' into sexy

commit 371bf380864d9cb9a18a4270f813f0802783c8b9
Author: Sourav Kundu <skundu@codeaurora.org>
Date:   Tue Oct 2 11:49:08 2012 -0700

    Performance enhancement.  Don't process non-visible lines for layout.

    Change-Id: Ie2b594afb4f5244e18719e4feea51966ad4745cd

commit bf830a708ce11850b8d8ce7d408ccfb73e894f36
Author: John Reck <jreck@google.com>
Date:   Wed Aug 8 17:27:13 2012 -0700

    DO NOT MERGE Fix memory leak

     Cherry pick

     Bug: 6952980
     GraphicsContext::createOffscreenContext creates an instance of both
     PlatformGraphicsSkia and GraphicsContext for ImageBuffer. However,
     ImageBuffer will only call delete on the GraphicsContext. In normal
     GC usage, the PlatformGraphicsContext's lifecycle is longer than the
     GCs, and is cleaned up by itself. This will result in leaking the
     PlatformGraphicsSkia context, though. We need to make sure to call
     delete on the PlatformGraphicsSkia context if we were initialized
     with the deleteUs() flag, which is used to indicate just this scenario.

    Change-Id: If908dcb44e99568b92ee63d6337ce9f84adc9adf

    Conflicts:

    	Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp

commit d89ce776551adef57d566edf023b76dd26e8d003
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Fri Jan 4 23:36:24 2013 -0500

    fix a couple compiler warnings

    Change-Id: I044c22bc0fa28d487ecdecff84681414f17ca710

commit b7f23bd268a0907006d2d13b49f19c9a2d4115a8
Author: Ebrahem Qassem <ekassem@codeaurora.org>
Date:   Sun Nov 20 14:59:32 2011 +0200

    webkit: networking optimizations

    networking features:
    - memory cache
    - request queue priority
    - event collection mechanism

    Change-Id: I19b3dbe97ceddf3651f3549dfa937577149e86d7

commit c95054ada8817e74262f4a7343d9a435b9680713
Author: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date:   Fri Aug 24 22:51:19 2012 +0200

    webkit: Fix build in ISO C++ 11 mode

    Change-Id: I32b3121ae46678f847dcd74ea74484aaf8f34eaf
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

commit 2524fd2870eca69549fca08c055ca347d1453ed0
Merge: 1bedf08 34e9989
Author: John Reck <jreck@android.com>
Date:   Thu Dec 6 10:24:24 2012 -0800

    Merge "Fix leak of inspectorClient when INSPECTOR disabled"

commit 34e9989872e19b60f1ac2b0c49f6b795f102fb1e
Author: Anders Fredlund <anders.fredlund@sonymobile.com>
Date:   Tue Oct 16 12:44:41 2012 +0200

    Fix leak of inspectorClient when INSPECTOR disabled

    WebKit PageClient api has undefined memory management. It seems
    to take custody of the parameters only if it wants to use it.
    Thus, only allocate inspectorClient if needed.

    Change-Id: Ibae7e683ec0c9553845c482b52dab7fad94e4398

commit 1bedf08833861aacd3bc8463332e9d11c3d614a5
Merge: e1e9db5 dec5441
Author: John Reck <jreck@android.com>
Date:   Tue Nov 20 11:17:03 2012 -0800

    Merge "[MIPS] Ensure correct buffer alignment for doubles."

commit dec5441e170f6cacbb0326406169cc5f4d6429ee
Author: Paul Lind <plind@mips.com>
Date:   Mon Nov 19 22:14:24 2012 -0800

    [MIPS] Ensure correct buffer alignment for doubles.

    For mips, doubles and objects containing them must be aligned
    to 8 bytes. This fixes up the LinearAllocator, so that the
    graphics context recording storage is properly aligned.

    This fixes a browser startup crash in Recording::draw()
    for concatCTM(), as AffineTransform contains an array of
    doubles.

    Change-Id: I8c06d0f4ed38d6ff0aad06d77016e55d57bb39b9

commit e1e9db52f8df0681114665b56368f7b19449ee33
Merge: 98ee7b8 322b973
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:24:41 2012 -0800

    am 322b9737: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '322b973788ce7eeed8c08fbfa77a93fe43f803c2':

commit 322b973788ce7eeed8c08fbfa77a93fe43f803c2
Merge: 398703a d9e7bdc f48fa4a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:16:46 2012 -0800

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I37ac21819a4935135534567a0e6d2f5732a17f33

commit 98ee7b8a5eb2c89439d7cdab914cc7b3d862f8b0
Merge: 8c0e5df f48fa4a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:16:22 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I9f43c1a10d1df3c9aa98d21d3dc8689da99fe1b8

commit 8c0e5df8a91955356325a6d526a18f2e1c2196b3
Merge: 4acf298 398703a
Author: Junichi Monma <monma@google.com>
Date:   Tue Oct 30 17:50:52 2012 -0700

    am 398703a1: Vertically writing characetrs even if the carrier emoji is available on the device.

    * commit '398703a12520dd1a7c2bdbd99d56fe024f761717':
      Vertically writing characetrs even if the carrier emoji is available on the device.

commit 4acf298a95b9078ce6c74e343103ec68174adb32
Merge: 46ea112 923f222
Author: Jamie Gennis <jgennis@google.com>
Date:   Thu Oct 25 18:17:13 2012 -0700

    am 923f222d: TransferQueue: use a few extra buffers

    * commit '923f222d2281bf1faac6221b3fb1298940a6d205':
      TransferQueue: use a few extra buffers

commit 46ea112fae10e7f950c7bd1c2e177b28979bde0c
Merge: 46d5a9c cbc18c5
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 23 11:49:39 2012 -0700

    am cbc18c58: Merge "Ensure AndroidAnimation\'s copy of its name string is unique" into jb-mr1-dev

    * commit 'cbc18c589df65272fabd2652b1b3f4d1af519579':
      Ensure AndroidAnimation's copy of its name string is unique

commit 46d5a9c2fe9f35830412ccad0d563549935a72a0
Merge: fabdfa6 a464817
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 22 15:55:07 2012 -0700

    am a464817e: Always use full transfer queue size on highEndGfx devices bug:7393228

    * commit 'a464817e995321cae99f09266e27d4fa322d9b31':
      Always use full transfer queue size on highEndGfx devices bug:7393228

commit fabdfa62512eaf9a96b899915ded677622a23ecb
Merge: 4ea6ae7 285c057
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 16 15:10:50 2012 -0700

    am 285c0572: Add src rect ptr null check

    * commit '285c0572401578498b0ccb0c3da0828544f2d085':
      Add src rect ptr null check

commit 4ea6ae7d16f731532d5ab93de637581ec4dc74f8
Merge: cbadc1b 8ff03fa
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Oct 10 09:23:53 2012 -0700

    am 8ff03fa0: am d60f8336: (-s ours) am 66ad15e4: DO NOT MERGE Control access to inherited methods of jsinterface objects

    * commit '8ff03fa0f7c92946342312e651aaf8a35f8f3b3c':
      DO NOT MERGE Control access to inherited methods of jsinterface objects

commit cbadc1b3028cd4610f9285f8dbc102cc4cdc1556
Merge: c8169b8 d9e7bdc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:28:58 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ieaa4d47de1bbfe3577d041a2ae8ac3232a653166

commit c8169b8acf598f836f1945f1a29d901afaac96c0
Merge: d0558f5 3430821
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 8 15:15:32 2012 -0700

    am 3430821e: Deep copy animation keyframe names

    * commit '3430821e4d58d0df4a5d5c62c62ed2dbfef348c0':
      Deep copy animation keyframe names

commit d0558f5c5bcdcb8b3536f7365fa4b5a819781b8b
Merge: 100f6d5 0d92bb8
Author: John Reck <jreck@android.com>
Date:   Mon Oct 8 12:32:24 2012 -0700

    am 0d92bb86: am e5986591: Merge "WebViewCore::createPrerenderCanvas failed unexpectedly"

    * commit '0d92bb867f45922c362c3f1be49b12d7d24899bf':
      WebViewCore::createPrerenderCanvas failed unexpectedly

commit 0d92bb867f45922c362c3f1be49b12d7d24899bf
Merge: 43e94fa e598659
Author: John Reck <jreck@android.com>
Date:   Mon Oct 8 12:30:05 2012 -0700

    am e5986591: Merge "WebViewCore::createPrerenderCanvas failed unexpectedly"

    * commit 'e59865912380984a799af2cd85d01d371cd806d5':
      WebViewCore::createPrerenderCanvas failed unexpectedly

commit e59865912380984a799af2cd85d01d371cd806d5
Merge: 1a6030e f8489b2
Author: John Reck <jreck@android.com>
Date:   Mon Oct 8 11:33:47 2012 -0700

    Merge "WebViewCore::createPrerenderCanvas failed unexpectedly"

commit f8489b2d31e94ed5a1c9df8c261a0fe2ca0f8242
Author: Yuyang Du <yuyang.du@intel.com>
Date:   Sun Oct 7 21:04:51 2012 -0400

    WebViewCore::createPrerenderCanvas failed unexpectedly

    m_scrollSetTime not in WebViewCore's ctor makes it randomly
    initialized, which leads to spurious scroll when creating
    prerender in WebViewCore::createPrerenderCanvas, which hence
    fails the creation.

    Fix it by adding m_scrollSetTime in initialization list.

    Change-Id: I4d834cfae091f645ac9cb4c99a4394164772872c
    Signed-off-by: Yuyang Du <yuyang.du@intel.com>
    Signed-off-by: Jack Ren <jack.ren@intel.com>
    Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
    Signed-off-by: Yuyang Du <yuyang.du@intel.com>

commit 100f6d546cc912e42631baf01b581d0ca28489ae
Merge: 9c876df b12afef
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:47:52 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If3d5b546f49020966439fe5333c3c26975a266b2

commit 9c876df700ae53c4b71eef008894d91a54733d65
Merge: fc36f7a df108a7
Author: Chris Craik <ccraik@google.com>
Date:   Wed Oct 3 10:12:57 2012 -0700

    am df108a70: Merge "Prevent fixed background layers for iframes" into jb-mr1-dev

    * commit 'df108a70a4ac13a2f67592afc32ef0be0054db2d':
      Prevent fixed background layers for iframes

commit fc36f7ad4f079caae20009dca0a24ae54180171e
Merge: 448d632 817a553
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:33:44 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib49bbf1ad3994405b31f126a388e9c36cf542069

commit 448d632d931a5ce1e62fe8558bafc81765bda6c1
Merge: 3bf407e e70c8a5
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 2 16:58:55 2012 -0700

    am e70c8a5a: Merge "Compensate for canvas-side vertical text translation in bounding box computation" into jb-mr1-dev

    * commit 'e70c8a5ad2ef1ce0804b27608fd96b825fc4ee95':
      Compensate for canvas-side vertical text translation in bounding box computation

commit 3bf407e639fda627d869b7c6899928bf6963434f
Merge: 41eeed1 58ca90e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:18:03 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id5cb6c1027aa73b6b9e70b89476037d918a4d34f

commit 41eeed12bb95d898adc020201d6a6d36210e70bd
Merge: bd501a1 4232600
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 1 11:24:08 2012 -0700

    am 42326004: Determine maxZoomScale from bitmap/text drawing

    * commit '42326004062d6b846c3050ad03a1e80fa9db425c':
      Determine maxZoomScale from bitmap/text drawing

commit bd501a1d4580bb020dfcde02f4c4588426b201db
Merge: 06722d9 224e946
Author: Chris Craik <ccraik@google.com>
Date:   Thu Sep 27 16:11:18 2012 -0700

    am 224e946b: Fix opaque rect calculation to quickreject transparent shader drawn ops

    * commit '224e946b3cabeaa9c360bdd6865485b5acb34cdc':
      Fix opaque rect calculation to quickreject transparent shader drawn ops

commit 06722d95519ce8f817c36cd3ebe9e6f944552447
Merge: 56adb81 98f974e
Author: Chris Craik <ccraik@google.com>
Date:   Thu Sep 27 10:53:37 2012 -0700

    am 98f974e6: Force stroke style for radio drawing

    * commit '98f974e63bc216d6c12d4d319d25bbf8751184ff':
      Force stroke style for radio drawing

commit 56adb811a83752c05cff7218ff3ef9ac9f0c461b
Merge: ae73b55 5419f63
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 10:35:29 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I664511e92ec1e9a78adba85c408c4f849acc6cb3

commit ae73b55474a7a13cb0dd60e7eb5bb47124ba61ee
Merge: f2e6907 866f5ba
Author: John Reck <jreck@google.com>
Date:   Thu Sep 13 13:16:36 2012 -0700

    am 866f5baf: Merge "Paint into the right PicturePile" into jb-mr1-dev

    * commit '866f5baf3e53d34e588845f01a3c4754814ccfda':
      Paint into the right PicturePile

commit f2e6907a172e98146a2b7c3d626991fbe6b39a53
Merge: 8d5f336 e581cc1
Author: John Reck <jreck@google.com>
Date:   Thu Sep 13 13:15:06 2012 -0700

    am e581cc10: Merge "Remove broken RLE path" into jb-mr1-dev

    * commit 'e581cc103d4ede2171c03cc9166ce40b8ddc5a97':
      Remove broken RLE path

commit 8d5f336a2e2adc08f3b2b4d4d1f4c96998d3f3f0
Merge: b9edf44 6aa888f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:40:19 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I22ccb2d9ec8b721b31bbe7da62c10baebe305fb9

commit b9edf443afec060bdff4f236f82c6b082abccbd4
Merge: 2563020 a3bef91
Author: Selim Gurun <sgurun@google.com>
Date:   Mon Sep 10 18:18:32 2012 -0700

    am a3bef91f: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev

    * commit 'a3bef91fa82b756b62aceb8ee1fa431fbad8f649':
      Control access to inherited methods of jsinterface objects

commit 2563020f0704e4cae3260c5262b1966568357fc3
Merge: e567df4 5248b7b
Author: Chris Craik <ccraik@google.com>
Date:   Mon Sep 10 16:34:25 2012 -0700

    am 5248b7b4: Merge "Disable clipping painter when painting 400+ operations" into jb-mr1-dev

    * commit '5248b7b4129bb49b803aee8bfec7ef35171e1325':
      Disable clipping painter when painting 400+ operations

commit e567df43ec8cc2aa11ad4cc657beecf9184747ff
Merge: 8064aa0 61df014
Author: John Reck <jreck@google.com>
Date:   Fri Sep 7 11:18:14 2012 -0700

    am 61df0147: Fix crash if SVG tries to load a resource

    * commit '61df0147f508e20bd22fab568b7c8b3c405cfad5':
      Fix crash if SVG tries to load a resource

commit 8064aa0f51097cb37966b098b1da4381e88c384f
Merge: f91651d 7fe521c
Author: John Reck <jreck@google.com>
Date:   Thu Sep 6 09:38:26 2012 -0700

    am 7fe521c6: Merge "Update RenderThemeAndroid drawing" into jb-mr1-dev

    * commit '7fe521c630ad9fb57d288c5d59af5ad4630ca166':
      Update RenderThemeAndroid drawing

commit f91651d1813ec92e7cb6c02b1d0ac51e198fe7b0
Merge: 342811a dd969a9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 07:53:29 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If31cb4609accd9b9d51b5a27a878635742dcfb71

commit 342811af674a02443bf7249128f17ccfb712544e
Merge: 7db6acf 49a1052
Author: John Reck <jreck@android.com>
Date:   Tue Sep 4 16:03:32 2012 -0700

    am 49a10524: am 43e94fa8: am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"

    * commit '49a105247bbbb06b1f1ec85c542d4dd5b1b019c3':
      Remove inconsistency between HistoryItem writing/reading

commit 7db6acfc566f547906578e8b6d918c6a9723e680
Merge: 5c57bc4 abf93d7
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 31 15:10:14 2012 -0700

    am abf93d76: Merge "Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManager" into jb-mr1-dev

    * commit 'abf93d76e0e37c2b42370f49dd171cde2096f92d':
      Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManager

commit 5c57bc4a3d8b312d76fd8edcabc8d0067bb40177
Merge: 532faa1 0bcdd83
Author: John Reck <jreck@google.com>
Date:   Fri Aug 31 13:18:30 2012 -0700

    am 0bcdd839: Merge "Fix initialization" into jb-mr1-dev

    * commit '0bcdd8399abbde312576550f32aa574145be5988':
      Fix initialization

commit 532faa1619cf025ecd62b0f35b360b758171a50b
Merge: 67ef848 9fa7e7c
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 31 11:58:23 2012 -0700

    am 9fa7e7c0: Merge "Fix potential corruption/leak in cookiejar." into jb-mr1-dev

    * commit '9fa7e7c0d2dbd5ad706d1c46cb839ba07a45a7a8':
      Fix potential corruption/leak in cookiejar.

commit 67ef848790db48e71978667708b9cf1e874bb393
Merge: bc943ef 9c867b2
Author: John Reck <jreck@android.com>
Date:   Fri Aug 31 10:21:30 2012 -0700

    am 9c867b2b: am 4d33d9fb: am 5fe0a0be: Merge "Crash on Orange media portal"

    * commit '9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8':
      Crash on Orange media portal

commit bc943ef5f555c2bca8c3d53e76f4ab1dc14aac31
Merge: f8403ab 3f9aace
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Aug 30 10:44:26 2012 -0700

    am 3f9aace3: am 76150b63: am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"

    * commit '3f9aace3c8671247a9b06117658d44282871ba89':
      Enable dynamic effect of GIF animating images in browser

commit f8403ab14a43cd145113bb5758e3901d309e576d
Merge: 832e918 9f828fb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Aug 30 08:32:45 2012 -0700

    am 9f828fb0: am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"

    * commit '9f828fb069693bb0f83ce7e2a82bb00ccecec969':
      webkit: enable no-pic compiling option

commit 832e9182c58eeaa6cb74a3eacc244e7956eeba07
Merge: 89ca519 9976df9
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Aug 29 15:40:07 2012 -0700

    am 9976df9e: Merge "Provide referer when download requested" into jb-mr1-dev

    * commit '9976df9e944fed76ce8c5b22b6317a63117c4e40':
      Provide referer when download requested

commit 89ca519416db201a7367b1d18fca3b0577dc7727
Merge: b07f7c4 f39a3cb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Aug 28 11:17:43 2012 -0700

    am f39a3cbe: am f2b8b88d: am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"

    * commit 'f39a3cbeac21b1d076bee9cbc25bec1d981f6aab':
      Fix memory leak caused by CSSRuleList wrapper

commit b07f7c48a4e928fa0b670abe6cb307c694c297b1
Merge: 8ab9b9d bb7f19e
Author: Jeff Brown <jeffbrown@google.com>
Date:   Mon Aug 27 17:17:36 2012 -0700

    am bb7f19e0: Merge "Use new surface flinger API." into jb-mr1-dev

    * commit 'bb7f19e094c0208180bc6f9c1b803cd29c507c8f':
      Use new surface flinger API.

commit 8ab9b9de46a58b8e62f6b325f200caf0899abe44
Merge: 9f15cf2 d2b6abb
Author: George Mount <mount@google.com>
Date:   Mon Aug 27 13:06:43 2012 -0700

    am d2b6abb0: Merge "Text around selection falls back to caret rect when not in text." into jb-mr1-dev

    * commit 'd2b6abb0b5522a20810fde546d0167ca04c66649':
      Text around selection falls back to caret rect when not in text.

commit 9f15cf2ec012b595527d8d30c62ef6c86f0b0373
Merge: 831d03f ae7d731
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 27 10:09:39 2012 -0700

    am ae7d7312: Don\'t track the opaque area of small drawing operations

    * commit 'ae7d73128baa76b45c16886913891a8a3c0baee3':
      Don't track the opaque area of small drawing operations

commit 831d03ff73bbf0a8277c7f25b149413887667f90
Merge: 8c6b432 19756ca
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 24 11:38:21 2012 -0700

    am 19756ca1: Only use the clipping painter when painting to a bitmap.

    * commit '19756ca1956aa2f3a4c7ef5095cb95a3010338ac':
      Only use the clipping painter when painting to a bitmap.

commit 8c6b4325e8fac73b9e59e3feacfb6dbe47983370
Merge: 7553e92 7498787
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:05:36 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I62a6ff7d83d89a46e79540087960ca445aa71364

commit 7553e92e8018f9d42610118190bfcafc081fac76
Merge: 129aa48 3dca445
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 20 14:29:46 2012 -0700

    am 3dca4454: Merge "Exit fast tile swap mode immediately upon SurfaceCollection swap" into jb-mr1-dev

    * commit '3dca44542840785fe67ba613c7fb0ded50e09bb4':
      Exit fast tile swap mode immediately upon SurfaceCollection swap

commit 129aa481cc9f2f8c6ac47d9273b1c56a408f5637
Merge: 86ec0ec a3546a8
Author: Victoria Lease <violets@google.com>
Date:   Mon Aug 20 13:14:17 2012 -0700

    am a3546a89: Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-dev

    * commit 'a3546a894a73b5cdaa068456c6a60d35646e9af0':
      DO NOT MERGE Text locale compatibility shim

commit 86ec0ec2e1bd16df8e0d7245b1e7e5deb85a1c30
Merge: cf5f8f1 bf9a979
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 20 12:32:37 2012 -0700

    am bf9a9798: Fix opaque operation area calculation

    * commit 'bf9a979842284165137a0eac2810b5cfd81346b9':
      Fix opaque operation area calculation

commit cf5f8f136a340b884a9b894893d826ab58180be6
Merge: 3bcbc96 d4389e2
Author: John Reck <jreck@google.com>
Date:   Fri Aug 17 18:19:02 2012 -0700

    am d4389e24: Merge "Support partial invals on layers" into jb-mr1-dev

    * commit 'd4389e24221d2c1c202990256f138c75effaa41b':
      Support partial invals on layers

commit 3bcbc968b8ed9a7677e0f7fe9a35fa169a445ffc
Merge: 70dfbb2 1bf7d7a
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 17 18:06:30 2012 -0700

    am 1bf7d7a2: Merge "Early return from layer painting when fully clipped" into jb-mr1-dev

    * commit '1bf7d7a2d1abb6e625e3bc7168c7cf3ced009ea7':
      Early return from layer painting when fully clipped

commit 70dfbb2cf3a7ab8d948779de5d29e664028f856e
Merge: aa141fc acc2ae6
Author: Joe Onorato <joeo@google.com>
Date:   Fri Aug 17 00:19:03 2012 -0700

    am acc2ae62: am e750fbf4: am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS"

    * commit 'acc2ae62ddaca4174333b8266a8baf9def87c53a':
      host modules don't need LOCAL_MODULE_TAGS

commit aa141fc9151202525ca6c8796c1f5d213221fc55
Merge: 7fbdb98 f717228
Author: John Reck <jreck@google.com>
Date:   Thu Aug 16 19:32:32 2012 -0700

    am f7172287: Merge "Fix SIGBUG due to misalignment" into jb-mr1-dev

    * commit 'f7172287cc11064b1e667b71e8087093e13bdf36':
      Fix SIGBUG due to misalignment

commit 7fbdb98508fc2851c5d4a46d03d78a2b2fd881e2
Merge: 06368aa 4aab53e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:10:17 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I6634617bff61a076dd6c272c31f433dd0e2f8a6e

commit 06368aac5004406f6cab3e8e3df737f0af5a121f
Merge: 2bd50df a8b0ead
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:01:52 2012 -0700

    am a8b0ead5: am f314e0fc: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'a8b0ead598943dfdb7b200920d15fefbc15c6904':

commit 2bd50df2d6573ad0d62082e3b60cade5588fd694
Merge: f760107 f693ed1
Author: Chris Craik <ccraik@google.com>
Date:   Thu Aug 16 16:25:12 2012 -0700

    am f693ed1f: Merge "Increase max texture count to accommodate large screens" into jb-mr1-dev

    * commit 'f693ed1ffc7b8c47b6ce8d56ebc6b35d9790e473':
      Increase max texture count to accommodate large screens

commit f760107e6853501c61e480b01d218ad4bb1aa14a
Merge: 486f8ab 23a1df8
Author: John Reck <jreck@google.com>
Date:   Thu Aug 16 15:36:54 2012 -0700

    am 23a1df87: Merge "Memory allocation changes" into jb-mr1-dev

    * commit '23a1df87f10aca45959959999d7b0c7106d5434d':
      Memory allocation changes

commit 486f8ab77bde00948d6b731b825e69919a8df623
Merge: c93bd5b de7ee90
Author: Chris Craik <ccraik@google.com>
Date:   Wed Aug 15 15:48:15 2012 -0700

    am de7ee902: Merge "Correctly handle preserve-3d layer ordering" into jb-mr1-dev

    * commit 'de7ee90281a581b2d1c1db13644b5a01e08bd150':
      Correctly handle preserve-3d layer ordering

commit c93bd5bd7fa866f13e0dcf2d8dca8b9cd273b018
Merge: 164f732 710a2d2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:27:00 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib6ae2768c8fcf7d9e46b60b8b734cc21c64c0300

commit 164f732002440fe68461b4ae3bd25f0ad7248509
Merge: 03e29ab a04673b
Author: George Mount <mount@google.com>
Date:   Wed Aug 15 07:47:51 2012 -0700

    am a04673be: Merge "Use content size for scroll width calculation." into jb-mr1-dev

    * commit 'a04673be6f4b2022f86ac53bdf124f7b4da515bb':
      Use content size for scroll width calculation.

commit 03e29ab101f98262b3e7c6963cdee6e2d59774b9
Merge: 1df0476 682a85c
Author: John Reck <jreck@google.com>
Date:   Tue Aug 14 17:02:56 2012 -0700

    am 682a85cb: Move text allocations to LinearAllocator

    * commit '682a85cb3ff0b200d4fe0f7ef41a4e1c57dea233':
      Move text allocations to LinearAllocator

commit 1df0476ffdfe1cec82cea6f9cca12f4a5d2e1e03
Merge: 9f6c4ed b0a56fa
Author: John Reck <jreck@google.com>
Date:   Tue Aug 14 11:42:08 2012 -0700

    am b0a56fa3: Memory usage improvements

    * commit 'b0a56fa335e9435238de5f2cde15076488057c52':
      Memory usage improvements

commit 9f6c4ede672f3cf35b4afeba55c47984c6f9863c
Merge: 3aa8129 fcadd7a
Author: John Reck <jreck@google.com>
Date:   Mon Aug 13 17:05:50 2012 -0700

    am fcadd7a7: am a78a0374: (-s ours) am 465864a6: DO NOT MERGE Null check

    * commit 'fcadd7a73d414109c41d46fcad0d199ddc656a34':
      DO NOT MERGE Null check

commit 3aa8129f5303d25cd895038d61d45e8ce1b4c244
Merge: 9333ff0 4026b62
Author: John Reck <jreck@google.com>
Date:   Mon Aug 13 15:37:13 2012 -0700

    am 4026b622: Merge "Null check" into jb-mr1-dev

    * commit '4026b622692441fead45a1b1cc5866e4ba1d4a6f':
      Null check

commit 9333ff0afbc604f0a813a028add9db58ad27761a
Merge: e8370a9 5b762b0
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 13 09:33:16 2012 -0700

    am 5b762b05: Merge "Improve in-canvas pure color checking" into jb-mr1-dev

    * commit '5b762b05d1ca3f7f73b0b017aeeceda544a82bb6':
      Improve in-canvas pure color checking

commit e8370a99989ee76752c83d39b3f76952336b2ac8
Merge: ab15a97 4c7e6e1
Author: John Reck <jreck@google.com>
Date:   Fri Aug 10 15:39:52 2012 -0700

    am 4c7e6e15: Merge "Clear mOperationState when calling popState" into jb-mr1-dev

    * commit '4c7e6e151b9c49fec439974383c1ba87079e934d':
      Clear mOperationState when calling popState

commit ab15a9766fb1d76ae2eb3aa71e286d774df0fc4e
Merge: b67bd5f 475624a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 12:40:28 2012 -0700

    am 475624ab: am f5bd5114: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '475624abf906e078ce765e876d2e3db116997f42':

commit b67bd5f27bb113744b30aa229956e7d88cb1bf80
Merge: 1035420 a04b9dc
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 10 10:41:55 2012 -0700

    am a04b9dcc: Merge "Paint with requested size instead of layer size" into jb-mr1-dev

    * commit 'a04b9dccdbde1cd374c69fd51cf7c3d10fb54d51':
      Paint with requested size instead of layer size

commit 1035420e194f84f17408032a85ce977ed12549f5
Merge: 4f82601 dd40749
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:52:17 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I42e6603685beee39769df67f5609a6f134b9a395

commit 4f82601ffbd97980a8118f1e85567b7ce220eaf3
Merge: 187ff87 fae34be
Author: John Reck <jreck@google.com>
Date:   Thu Aug 9 10:39:39 2012 -0700

    am fae34be5: am 4bab8233: (-s ours) am 28c43cfa: DO NOT MERGE Fix memory leak

    * commit 'fae34be5c51ed83fa7eecd9026263c949fed2078':
      DO NOT MERGE Fix memory leak

commit 187ff87e6a3d0cadbf41d964e6655ab579e13a12
Merge: 5229116 8c7c2d0
Author: Chris Craik <ccraik@google.com>
Date:   Thu Aug 9 09:32:08 2012 -0700

    am 8c7c2d0a: Merge "Clip out opaque regions to avoid double painting" into jb-mr1-dev

    * commit '8c7c2d0abdf43d24330934ed223347ac3f0cf957':
      Clip out opaque regions to avoid double painting

commit 522911687acedcaaf23518b396cb14efe67fa2a9
Merge: 7c998e6 ddb9860
Author: John Reck <jreck@google.com>
Date:   Wed Aug 8 17:40:02 2012 -0700

    am ddb9860f: Fix memory leak

    * commit 'ddb9860fb5d82fbf1a96746d26d1b7b39a8ef8a2':
      Fix memory leak

commit 7c998e67cad51e503f89cfd830ba4e8bd3bf68ab
Merge: 3ba661c e015937
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:16:30 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ic6d4fa4f70ee45ae49847b685563e312d5a19f5b

commit 3ba661c2ee40c0cb01d58966c712184db6eb9ff0
Merge: 32a0a22 ebebc5e
Author: Chris Craik <ccraik@google.com>
Date:   Tue Aug 7 17:25:02 2012 -0700

    am ebebc5e5: Merge "Reset cached opacity on shader swap" into jb-mr1-dev

    * commit 'ebebc5e52683c447aef50606d0418d8de629d60a':
      Reset cached opacity on shader swap

commit 32a0a227c211119a6655615bee1adf0be3a9645b
Merge: e007f77 a78491e
Author: John Reck <jreck@google.com>
Date:   Tue Aug 7 14:59:33 2012 -0700

    am a78491ed: Add extra null check

    * commit 'a78491ed6e0d7534ad725fbb620aaf8ea6a07a58':
      Add extra null check

commit e007f77254a6e7b2af8938331b49e0dbd8ae7c2f
Merge: 76882e8 a6e2099
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:03:16 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If54d4f3674f53c09c84f257046cebd2ad5229cb4

commit 76882e8904f7d2f7f20417cfe988530e17c82441
Merge: 89a4289 3718b58
Author: John Reck <jreck@google.com>
Date:   Mon Aug 6 17:53:17 2012 -0700

    am 3718b58e: Remove usages of getCanvas

    * commit '3718b58e4da76b7025aa5316a51264c5e38f2569':
      Remove usages of getCanvas

commit 89a42891d16d3acd49995ee937b84c46736ca975
Merge: 24d4bd1 1a6cc72
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:20:07 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iccfb14f92ced073b554212585ce71215e479f0e7

commit 24d4bd10da6bf919fdf855cf1707648205866c59
Merge: 0d02751 f2eb756
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 13:56:21 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id62ecd4ca53e25ef814309de539a13bed7d8a4e5

commit 0d027519802f1d6f6f5290be25ba0faf5e6e5953
Merge: f1d82a9 6228f16
Author: John Reck <jreck@android.com>
Date:   Thu Aug 2 15:43:46 2012 -0700

    am 6228f161: am dd5962d2: am 47387cc7: Merge "Fix browser rendering issue: pure color tiles are rendered black"

    * commit '6228f1617d7525d64a23edd3b497791c6a06e842':
      Fix browser rendering issue: pure color tiles are rendered black

commit f1d82a9dc25cc7196390eff2c343f24c96b6bca7
Merge: ae5704e 3fe9241
Author: George Mount <mount@google.com>
Date:   Thu Aug 2 14:57:11 2012 -0700

    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.

commit ae5704e5d67caa1a13d68d3dd9438ac5f4f89a1f
Merge: 22e467f f0ad26a
Author: John Reck <jreck@google.com>
Date:   Wed Aug 1 18:29:17 2012 -0700

    am f0ad26a9: Merge "Tweak shadow settings" into jb-mr1-dev

    * commit 'f0ad26a937ebc7c889abf512e2ec83914ccbf01f':
      Tweak shadow settings

commit 22e467fcbbf5aed395880faa01f5976729d670c4
Merge: 1f3ede9 7b227cf
Author: Elliott Hughes <enh@google.com>
Date:   Wed Aug 1 16:53:06 2012 -0700

    am 7b227cf2: Fix build by adding missing #include.

    * commit '7b227cf2e1a760763e73bb4ceccd3125cd120559':
      Fix build by adding missing #include.

commit 1f3ede9c94d32a4d9604499a6a1995f631ded126
Merge: ab17631 95e3241
Author: Nicolas Roard <nicolasroard@google.com>
Date:   Wed Aug 1 14:49:54 2012 -0700

    am 95e32410: Optimize recompute bounds checks

    * commit '95e32410ffa4f84bc6b140640731bd44c50cee88':
      Optimize recompute bounds checks

commit ab17631320ed00fae606f6eba0969ceb83559b34
Merge: 9a84e52 887267b
Author: John Reck <jreck@google.com>
Date:   Wed Aug 1 11:27:57 2012 -0700

    am 887267ba: Fix PicturePile size adjust path

    * commit '887267ba11d80d5d04a9a45cda2f3d205ee08acd':
      Fix PicturePile size adjust path

commit 9a84e528024f7f944ff5b9d2d28539d0ea7c013a
Merge: 89a6e50 74d16a7
Author: John Reck <jreck@google.com>
Date:   Tue Jul 31 17:48:19 2012 -0700

    am 74d16a76: Memory cleanup

    * commit '74d16a7661fcde10787bc62b4c62e202c9cc2495':
      Memory cleanup

commit 89a6e5053e990e0977f67ade4ff6684938f5afe7
Merge: 81730a4 d9779ad
Author: John Reck <jreck@google.com>
Date:   Tue Jul 31 17:18:02 2012 -0700

    am d9779adc: Switch GraphicsOperation to LinearAllocator

    * commit 'd9779adc025ab665fde1c9983e7793e96ab56d4e':
      Switch GraphicsOperation to LinearAllocator

commit 81730a4f5b38d20a227012b7023e0f4bd5151371
Merge: b1f6b18 8468e3c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:03:01 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I2dbd918d7aa6d7102f372019e45c32054ab3532f

commit b1f6b1885edf2df16b47fed92ad29c39d626fd01
Merge: c514bac 9b4b8a1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:04:00 2012 -0700

    Reconcile with jb-mr1-release

    Change-Id: Ie0a931ef42c853b55dd26a4c9d56898f3617455c

Change-Id: I430e39868a6c462358863a34cda307d04c53b1e6