Squashed commit of the following:

commit 2fec4ff3dd57cda25cbcb9a009a745dd49173c0a
Author: George Mount <mount@google.com>
Date:   Wed May 1 07:55:40 2013 -0700

    Keep LTR selection within the text range.

     Bug 8556162
     The end caret position for LTR text can be one beyond the range
     of the text. This change places the selection region back into
     the text so that the proper text is selected.

    Change-Id: I470ee5e3438190aab9f5fb12deca95249d9d887e

commit 3416e5ae328ef637a7f8b9f521cafa28b68947e6
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 21:53:05 2013 -0700

    Add liblog

    Bug: 8580410
    Change-Id: I17bdc7cec475a9d730d08b96ffbedd5401f5da56

commit 7e516b571b654603b28b01361c58eea94abc1927
Author: Ying Wang <wangying@google.com>
Date:   Fri Apr 5 18:06:02 2013 -0700

    Switch to prebuilt bison

    Now we have prebuilt bison 2.7 for both Linux and Mac OS X.
    We don't need the LOCAL_BISON or LOCAL_YACC any more.

    Bug: 8517572
    Change-Id: I11319b7e154bbfe6355c98bd1d7f5f22ed727f85

commit 76bdf274a35fbc9f94d90438e38cab35b1e9f4da
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Apr 4 14:36:52 2013 -0700

    Rename old chromium logtag to chromium_net

    This is to make it easier to see what is from the chromium library
    and what is from the chromium_net library.

    Change-Id: Idb3a660aa7d864d68691743bd15f0ce59cd4dae2

commit c15e83e3313f9adc8c47e19be5d8218738b663d0
Author: Wink Saville <wink@google.com>
Date:   Thu Apr 4 06:24:43 2013 -0700

    Build fix with newer bison 2.6

    From: http://trac.webkit.org/changeset/124099

    Bug: 8517572
    Change-Id: Iaead93f01d6a86180c21e320ef56a4620619ce00

commit b2e091a5ffd9e2c395084b2c0bb09a35645af3a3
Author: Björn Isaksson <bjorn.isaksson@sonymobile.com>
Date:   Mon Oct 29 14:13:36 2012 +0100

    DO NOT MERGE Fix memory leak when creating SkBitmapProcShader

    cherry pick from AOSP/master

    A SkShader is ref counted, but the first but unref() was
    never called for the local reference in
    PlatformGraphicsContextSkia::drawBitmapPattern().

    Change-Id: I2d1a2e95eeaf479e332a2dbd4e1e9f1b8baac0f7

commit d307f7f0361f3102cb4d3dade523484cb1463e5a
Merge: 6217f3f d6f13da
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 15:14:07 2013 -0700

    Ignore d6f13da9

commit d6f13da9ac4acbf243824fb65b2f08ae422298b0
Merge: d5a63fb 30ca089
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 15:07:02 2013 -0700

    am 30ca089e: Merge "Tweaks for forward compatibility"

    * commit '30ca089e04a091c4eea95d62185d120a61f0e0ba':
      Tweaks for forward compatibility

commit 30ca089e04a091c4eea95d62185d120a61f0e0ba
Merge: 59ef364 994e625
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 22:01:21 2013 +0000

    Merge "Tweaks for forward compatibility"

commit 6217f3f81ed52923cf04290df4c0496d1741c33a
Merge: 1a3ee2b d5a63fb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:18 2013 -0700

    am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'd5a63fb6d763551b31f0dd9563ccc17e4652094b':

commit d5a63fb6d763551b31f0dd9563ccc17e4652094b
Merge: 59ef364 1ea0670
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:06:40 2013 -0700

    am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':

commit 1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78
Merge: e02247f cf076e6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:41:45 2013 -0700

    am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'cf076e61dbf727a931a6be1cc2811d795a165f77':

commit cf076e61dbf727a931a6be1cc2811d795a165f77
Merge: e02247f 61c04aa
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:23:02 2013 -0700

    am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '61c04aad1e2313a22822173f3776b85d664984ae':

commit 61c04aad1e2313a22822173f3776b85d664984ae
Merge: 398703a f48fa4a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:18:47 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit 1a3ee2b8928fe69d13bdfb980ac1c7994ff0d334
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Mar 7 08:55:22 2013 -0800

    Remove reference to ganesh

    Change-Id: I26c5f6348cea0018a8129e0e6ffdb3b0cfe61d82

commit 994e625d195c8d9b57bffd34523264527411212f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Mar 6 15:29:51 2013 -0800

    Tweaks for forward compatibility

    Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1

commit 44c5ab945401080852dfd614e0f18fe39fff94e0
Merge: 877f98d 59ef364
Author: Brian Carlstrom <bdc@google.com>
Date:   Tue Mar 5 00:56:07 2013 +0000

    am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

    * commit '59ef364a8888ce8ec05d55f9093536ecf6d43aa6':
      Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding

commit 59ef364a8888ce8ec05d55f9093536ecf6d43aa6
Merge: e6057f8 b16dd02
Author: Brian Carlstrom <bdc@google.com>
Date:   Mon Mar 4 17:50:11 2013 +0000

    Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

commit b16dd02e53d57f3d712f1da6d3ded0df1509b78d
Author: Brian Carlstrom <bdc@google.com>
Date:   Wed Feb 27 18:01:27 2013 -0800

    Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding

    Change-Id: I819170e26536bdf8f37fda4986506b029be5ebd3

commit 877f98dfb48635a05091716319d6971197136055
Author: Ying Wang <wangying@google.com>
Date:   Fri Feb 22 16:43:08 2013 -0800

    Fix assignment type.

    Actually I need a new commit to kick the build cache scheduler :-).

    Change-Id: Icecda566e3d2f5a12be29580c6ce83a5be8dbb3c

commit 9f80dad96d0f4636c459f5cfd95b044337eaf184
Merge: 8f409a9 b6dd8e8
Author: Derek Sollenberger <djsollen@google.com>
Date:   Fri Feb 22 09:43:21 2013 -0500

    Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'

    bug: 6906025

commit b6dd8e8e8d87d6f7816929bce8c04c0aac59c0ba
Author: Derek Sollenberger <djsollen@google.com>
Date:   Thu Feb 21 13:03:55 2013 -0500

    Update SkCanvas subclass to override the proper superclass virtuals.

    bug: 8167188
    Change-Id: Ica8d741cfde62a161e24f3558471d2c190f7fe5e

commit 8efeae4f7793e201261f7b70e53285cfa148dc6a
Merge: 397fd86 8f409a9
Author: Ed Heyl <edheyl@google.com>
Date:   Wed Feb 20 13:55:54 2013 -0800

    am 8f409a96: Merge remote-tracking branch \'goog/jb-mr2-release\'

    * commit '8f409a964f8ece608f4eb34fe5c7d23ec16c8687':
      Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

commit 8f409a964f8ece608f4eb34fe5c7d23ec16c8687
Merge: fcc2b34 8b59afc
Author: Ed Heyl <edheyl@google.com>
Date:   Wed Feb 20 13:47:27 2013 -0800

    Merge remote-tracking branch 'goog/jb-mr2-release'

commit 8b59afc47cd61d8b2eedd604747a3cf3b043823d
Merge: fcc2b34 dbf57af
Author: The Android Automerger <android-build@android.com>
Date:   Tue Feb 19 09:51:06 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 397fd86f55a16ca7d05a32f2372b77d35478915b
Merge: 4e40a24 fcc2b34
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Feb 15 16:18:55 2013 -0800

    am fcc2b346: fix build: SurfaceTextureClient to Surface rename

    * commit 'fcc2b346069b347a4a2fc2615c548ad5f01808c0':
      fix build: SurfaceTextureClient to Surface rename

commit fcc2b346069b347a4a2fc2615c548ad5f01808c0
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Feb 15 16:16:43 2013 -0800

    fix build: SurfaceTextureClient to Surface rename

    Change-Id: I4fffda5c0ad18b8693e731427a98a98d8270cf76

commit 4e40a24c68d617858617546dd474407cf70a509c
Merge: 9a8cad0 50dbebb
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Feb 15 14:46:37 2013 -0800

    am 50dbebbe: fix build: SurfaceTextureClient to Surface rename

    * commit '50dbebbe7b246a0756c750ff18d5b77d6e4a2a68':
      fix build: SurfaceTextureClient to Surface rename

commit 50dbebbe7b246a0756c750ff18d5b77d6e4a2a68
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Feb 15 14:44:58 2013 -0800

    fix build: SurfaceTextureClient to Surface rename

    Change-Id: I47f20c1df5c6427c37b0b276f86ba3cca1cb0caa

commit 9a8cad0c207ae291051e96492bd167cf6e11f863
Merge: 741ee32 4533237
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Feb 15 14:28:17 2013 -0800

    am 4533237f: Refactoring: Rename SurfaceTextureClient to Surface

    * commit '4533237f156ff61f2486d0e6d748eafa8ce4d3d3':
      Refactoring: Rename SurfaceTextureClient to Surface

commit 741ee32b92b59154ba524dd735809fda6211fc5b
Merge: 5579d45 5b2c15f
Author: Mathias Agopian <mathias@google.com>
Date:   Thu Feb 14 19:58:39 2013 -0800

    am 5b2c15ff: [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_ID

    # Via Mathias Agopian
    * commit '5b2c15ff431547571fa3964c3cae937b657efe60':
      [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_ID

commit 4533237f156ff61f2486d0e6d748eafa8ce4d3d3
Author: Mathias Agopian <mathias@google.com>
Date:   Thu Feb 14 19:01:03 2013 -0800

    Refactoring: Rename SurfaceTextureClient to Surface

    Change-Id: I41134fe88716917ce4327293335fa116f44fabe3

commit 5b2c15ff431547571fa3964c3cae937b657efe60
Author: Mathias Agopian <mathias@google.com>
Date:   Thu Feb 14 13:35:17 2013 -0800

    [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_ID

    Change-Id: Ic7cc4d48587079cd57ac9f3afefccd9a003247c1

commit dbf57af16480b89fafd50e1e394c2beff7dfe948
Author: Chris Craik <ccraik@google.com>
Date:   Wed Feb 13 10:22:00 2013 -0800

    Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

    This reverts commit 77437f7411c2a1b6eed9e8635cd1d79c216064af, reversing
    changes made to 97df262f2fd351a399bc757d3f7e7c7bb3b00065.

    Change-Id: I594d7f423efce65f02b7ac14aff875aa22742ad0

commit 5579d45a99df147fcf22c915c56e200b53ba5bec
Merge: 5ff1185 455b107
Author: Chris Craik <ccraik@google.com>
Date:   Wed Feb 13 15:18:08 2013 -0800

    am 455b1078: (-s ours) Revert "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE

    # Via Chris Craik
    * commit '455b107800e69ea7615ffad1a83bb250d699f6ae':
      Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

commit 455b107800e69ea7615ffad1a83bb250d699f6ae
Author: Chris Craik <ccraik@google.com>
Date:   Wed Feb 13 10:22:00 2013 -0800

    Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

    This reverts commit 77437f7411c2a1b6eed9e8635cd1d79c216064af, reversing
    changes made to 97df262f2fd351a399bc757d3f7e7c7bb3b00065.

    Change-Id: I594d7f423efce65f02b7ac14aff875aa22742ad0

commit 5ff11851d1d200d20f6414fb109801314b72e57e
Merge: 77437f7 e6057f8
Author: John Reck <jreck@android.com>
Date:   Tue Feb 12 15:18:43 2013 -0800

    am e6057f8f: Merge "Fix compilation warning for list of initialization constructor arguments after bae7aeaa87."

    # By Oleg Smirnov
    # Via Gerrit Code Review (1) and Oleg Smirnov (1)
    * commit 'e6057f8fac4f62027696d0be56dd77cbe8d7b00d':
      Fix compilation warning for list of initialization constructor arguments after bae7aeaa87.

commit e6057f8fac4f62027696d0be56dd77cbe8d7b00d
Merge: b6cb93c f0085a2
Author: John Reck <jreck@android.com>
Date:   Tue Feb 12 23:09:53 2013 +0000

    Merge "Fix compilation warning for list of initialization constructor arguments after bae7aeaa87."

commit f0085a265fadca39e90d6eaf1a922a543ec8e9a3
Author: Oleg Smirnov <osa.spb@gmail.com>
Date:   Mon Feb 11 15:22:23 2013 +0400

    Fix compilation warning for list of initialization constructor arguments
    after bae7aeaa87.

    Change-Id: I75716404cfeb76d2d79efb94c82d57345e3e9932

commit 77437f7411c2a1b6eed9e8635cd1d79c216064af
Merge: 97df262 1d825a2
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Feb 5 13:53:17 2013 -0500

    Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'

    bug: 6906025

commit 1d825a24ae1071c3e8eea247f06329f89b7248bf
Author: Derek Sollenberger <djsollen@google.com>
Date:   Mon Feb 4 15:40:51 2013 -0500

    Changes needed to roll Skia to r7527.

    Change-Id: Icf9f0a42d8c84385a70b15a72d2d040eb96d942a

commit 94bcd9e3661813605b05f5f19601bb6b665476bb
Merge: 308dfd2 97df262
Author: John Reck <jreck@android.com>
Date:   Wed Jan 30 12:09:58 2013 -0800

    am 97df262f: am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"

    # By dvshkurk
    # Via Android Git Automerger (2) and others
    * commit '97df262f2fd351a399bc757d3f7e7c7bb3b00065':
      Avoid members with the same base name in ar's archives

commit 97df262f2fd351a399bc757d3f7e7c7bb3b00065
Merge: 9dbf86a b6cb93c
Author: John Reck <jreck@android.com>
Date:   Wed Jan 30 11:22:02 2013 -0800

    am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"

    # By dvshkurk
    # Via Android Git Automerger (1) and others
    * commit 'b6cb93cfb62e26168298b6f6e606af379350b064':
      Avoid members with the same base name in ar's archives

commit b6cb93cfb62e26168298b6f6e606af379350b064
Merge: 4f40a4e ae0bf53
Author: John Reck <jreck@android.com>
Date:   Wed Jan 30 11:17:48 2013 -0800

    am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"

    # By dvshkurk
    # Via Gerrit Code Review (1) and Shuo Gao (1)
    * commit 'ae0bf538d04d4d64cec2d753dc633a731cf45daa':
      Avoid members with the same base name in ar's archives

commit ae0bf538d04d4d64cec2d753dc633a731cf45daa
Merge: e428580 39cc429
Author: John Reck <jreck@android.com>
Date:   Wed Jan 30 18:19:54 2013 +0000

    Merge "Avoid members with the same base name in ar's archives"

commit 39cc42902adc24c1b6c8f06e23a7030e062c658f
Author: dvshkurk <Dmitry.V.Shkurko@intel.com>
Date:   Thu Jun 7 18:59:48 2012 +0700

    Avoid members with the same base name in ar's archives

    Change-Id: I4f45bba09476b9e8fbc5c73761addcec964962d4
    Author: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com>
    Signed-off-by: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com>
    Singed-off-by: Shuo Gao <shuo.gao@intel.com>
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
    Signed-off-by: Jack Ren <jack.ren@intel.com>
    Author-tracking-BZ:47091

commit 308dfd2dfccc78a73ababf1f256b20e9cd35875e
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 16:23:01 2013 -0500

    fix for broken merge resolution in Ia2c5

    Change-Id: Id65f22a7e972511047feb06d3d382819e63c9d7d

commit 31cbb6d924e6d854ced4f9923c1edc8dc90e4fbc
Merge: b9f64a6 d24d961
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 20:48:03 2013 +0000

    Merge "resolved conflicts for merge of 9dbf86ac to master-chromium" into master-chromium

commit d24d961e2679b920dea78cd010282cfc03894f4d
Merge: a45be6b 9dbf86a
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 15:47:00 2013 -0500

    resolved conflicts for merge of 9dbf86ac to master-chromium

    Change-Id: Ia2c5a9c5c4cfc280b46ca7b403599059131f8d7c

commit b9f64a6a515d707388e9ff4bc7e3c194775481bc
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 15:42:22 2013 -0500

    Fix for API change between versions of Skia.

    Change-Id: Ibec874144d382f1e4ce60f923eab3adcc1d642e0

commit 9dbf86ac6e32318742f65354680ebc1d94217d92
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 15:35:53 2013 -0500

    Fix for missing includes that is breaking the build.

    Change-Id: Ic84b869b5e185d99ae804d7471dcb26176f33335

commit a45be6bc30e84834295b88ebeb513d45ca1781cb
Merge: 8b3ec81 0b7e0b6
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Jan 22 12:21:22 2013 -0800

    am 0b7e0b6a: Isolate Playback of SkPictures that we encoded with an older version of Skia.

    * commit '0b7e0b6ac6ab34ea2d11b4891ca91f359e231cfe':
      Isolate Playback of SkPictures that we encoded with an older version of Skia.

commit 0b7e0b6ac6ab34ea2d11b4891ca91f359e231cfe
Author: Derek Sollenberger <djsollen@google.com>
Date:   Wed Jan 16 14:58:53 2013 -0500

    Isolate Playback of SkPictures that we encoded with an older version of Skia.

    There are companion changes to this in...
      external/skia
      frameworks/base

    bug: 8019756
    Change-Id: Ib6e015a1b0c04d1429f60929879c9f1687d51afe

commit 8b3ec812cb2f43209fca40ac47f1f27f6e6715c2
Merge: 6cb93fb a353adc
Author: Chris Craik <ccraik@google.com>
Date:   Thu Jan 17 16:25:39 2013 -0800

    am a353adcb: Clear the cached fillportion

    * commit 'a353adcb4dc7e94989477bdbf50b6a6025402b9f':
      Clear the cached fillportion

commit a353adcb4dc7e94989477bdbf50b6a6025402b9f
Author: Chris Craik <ccraik@google.com>
Date:   Thu Jan 17 15:40:28 2013 -0800

    Clear the cached fillportion

    If the GL program changes and the fillPortion changes between drawing two
    TileGrids, the field wouldn't be cached correctly.

    Change-Id: Ib2d307a71f40792c5c635f9c32e2b7b76a2c6de7

commit 6cb93fbe2918e0154784dacc02c812d2748e0a23
Merge: 452bdff 355d1d1
Author: John Reck <jreck@android.com>
Date:   Fri Jan 11 11:00:07 2013 -0800

    am 355d1d1a: am 4f40a4e3: am e4285808: Merge "WebViewCore destructor must delete m_textFieldInitDataGlue"

    * commit '355d1d1abae3376761893a29e7d18182b845abad':
      WebViewCore destructor must delete m_textFieldInitDataGlue

commit 355d1d1abae3376761893a29e7d18182b845abad
Merge: ddbf1e6 4f40a4e
Author: John Reck <jreck@android.com>
Date:   Fri Jan 11 10:53:37 2013 -0800

    am 4f40a4e3: am e4285808: Merge "WebViewCore destructor must delete m_textFieldInitDataGlue"

    * commit '4f40a4e39c5e17770a8523d513d757af7857775f':
      WebViewCore destructor must delete m_textFieldInitDataGlue

commit 4f40a4e39c5e17770a8523d513d757af7857775f
Merge: b40f5d7 e428580
Author: John Reck <jreck@android.com>
Date:   Thu Jan 10 10:18:02 2013 -0800

    am e4285808: Merge "WebViewCore destructor must delete m_textFieldInitDataGlue"

    * commit 'e42858085bbcda11708ca0eefed073294112c049':
      WebViewCore destructor must delete m_textFieldInitDataGlue

commit e42858085bbcda11708ca0eefed073294112c049
Merge: 2524fd2 07b5085
Author: John Reck <jreck@android.com>
Date:   Thu Jan 10 09:31:31 2013 -0800

    Merge "WebViewCore destructor must delete m_textFieldInitDataGlue"

commit 07b5085db1a501370e38afe46ef95ef959495164
Author: Magnus Hallqvist <magnus.hallqvist@sonymobile.com>
Date:   Wed Nov 14 16:12:33 2012 +0100

    WebViewCore destructor must delete m_textFieldInitDataGlue

    There was a memory leak detected in processes using webkit.
    Investigation showed that it was the TextFieldInitDataGlue
    object created in WebViewCore constructor.

    Change-Id: I86a11f99f13aca6ab990627a9106c9e9b781edee

commit 452bdffe9a208cf01a467cb1b23166e0eeedd738
Author: Derek Sollenberger <djsollen@google.com>
Date:   Thu Dec 20 14:41:10 2012 -0500

    Changes needed to update Skia to revision 6890.

    Change-Id: Ia12db820a72172a3f404582ab1bb6734181db3a8

commit efe36e2a0ed3399a76dfcff24cba0768c098f49b
Merge: ddbf1e6 9246e92
Author: Derek Sollenberger <djsollen@google.com>
Date:   Wed Dec 19 06:17:31 2012 -0800

    Merge "Apply changes to the WebView for compatibility with r5967 of Skia." into master-chromium

commit ddbf1e63de50066df17c19a621d17634acde2dfa
Author: Andy McFadden <fadden@android.com>
Date:   Tue Dec 18 11:15:50 2012 -0800

    Rename ISurfaceTexture and SurfaceTexture

    The C++ class names don't match what the classes do, so rename
    ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
    GLConsumer.

    Bug 7736700

    Change-Id: Ib3c4138f42332cfe5200f526e2038fb0bdc40738

commit 353a382240d47286022b6d23516c9302d6375db6
Author: Jamie Gennis <jgennis@google.com>
Date:   Tue Dec 11 17:04:00 2012 -0800

    stop using a deprecated SurfaceTextureClient ctor

    Change-Id: Iea3eeaa877535e8eae84ef14b6d4ff755541d3b2

commit 9246e92499ef49d56299dd6801def77dae32449b
Author: Derek Sollenberger <djsollen@google.com>
Date:   Tue Aug 14 16:39:05 2012 -0400

    Apply changes to the WebView for compatibility with r5967 of Skia.

    bug: 6906025
    Change-Id: Ia434cc8b6fc00db391ca9e6686de9b9f35d63b22

commit fd7652c93bfdf31ea3273c465d524391a5a0c9f6
Merge: a2c5f80 b40f5d7
Author: John Reck <jreck@android.com>
Date:   Fri Dec 7 12:21:58 2012 -0800

    am b40f5d72: am 2524fd28: Merge "Fix leak of inspectorClient when INSPECTOR disabled"

    * commit 'b40f5d724d7ee13d54246f5794375c3c9945f90a':
      Fix leak of inspectorClient when INSPECTOR disabled

commit b40f5d724d7ee13d54246f5794375c3c9945f90a
Merge: 09e90f5 2524fd2
Author: John Reck <jreck@android.com>
Date:   Fri Dec 7 12:18:41 2012 -0800

    am 2524fd28: Merge "Fix leak of inspectorClient when INSPECTOR disabled"

    * commit '2524fd2870eca69549fca08c055ca347d1453ed0':
      Fix leak of inspectorClient when INSPECTOR disabled

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 a2c5f805f838b31fbbeb248aa021e0cf0c758d7b
Author: Chris Craik <ccraik@google.com>
Date:   Thu Dec 6 10:18:07 2012 -0800

    Use libutils LinearAllocator

    Depends on frameworks/native CL 0a73f822b1da82663a00d0ab977058a0dc40c50d

    Change-Id: Ifbacb894b2110a9135ac8f471eba0717cd124713

commit aa2137427e6acf8761b8c7297a0a65c5eb557e3d
Merge: 95293e3 09e90f5
Author: Chris Craik <ccraik@google.com>
Date:   Mon Dec 3 16:20:39 2012 -0800

    am 09e90f53: am e02247f4: Only signal collection swap on true swap

    * commit '09e90f537aaeec9a49c9d199826d290671709d59':
      Only signal collection swap on true swap

commit 09e90f537aaeec9a49c9d199826d290671709d59
Merge: 76626e3 e02247f
Author: Chris Craik <ccraik@google.com>
Date:   Mon Dec 3 16:18:17 2012 -0800

    am e02247f4: Only signal collection swap on true swap

    * commit 'e02247f4c53e1df4cac3a7b265ffb4307cca3650':
      Only signal collection swap on true swap

commit e02247f4c53e1df4cac3a7b265ffb4307cca3650
Author: Chris Craik <ccraik@google.com>
Date:   Mon Dec 3 10:34:32 2012 -0800

    Only signal collection swap on true swap

    bug:7484054

    Change-Id: I7cb648f64f45711013996be7e2cd0dabdbd614ae

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 95293e3b816cc4ca76b4dfcd0502e6d7316369bd
Merge: 58a0103 76626e3
Author: John Reck <jreck@android.com>
Date:   Tue Nov 20 11:40:29 2012 -0800

    am 76626e3b: am 1bedf088: Merge "[MIPS] Ensure correct buffer alignment for doubles."

    * commit '76626e3b0e4da3b0b8dbad173e94717280dd7df0':
      [MIPS] Ensure correct buffer alignment for doubles.

commit 76626e3b0e4da3b0b8dbad173e94717280dd7df0
Merge: 5c7e256 1bedf08
Author: John Reck <jreck@android.com>
Date:   Tue Nov 20 11:37:52 2012 -0800

    am 1bedf088: Merge "[MIPS] Ensure correct buffer alignment for doubles."

    * commit '1bedf08833861aacd3bc8463332e9d11c3d614a5':
      [MIPS] Ensure correct buffer alignment for doubles.

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 58a01038bb9238482d12a79465288b087ef702ea
Merge: fb622c6 5c7e256
Author: Chris Craik <ccraik@google.com>
Date:   Fri Nov 16 11:37:18 2012 -0800

    am 5c7e2567: am 0b65fac4: Revert "TransferQueue: use a few extra buffers"

    * commit '5c7e256704043f0873b33b39bd1c8046b2671a05':
      Revert "TransferQueue: use a few extra buffers"

commit 5c7e256704043f0873b33b39bd1c8046b2671a05
Merge: e1e9db5 0b65fac
Author: Chris Craik <ccraik@google.com>
Date:   Fri Nov 16 09:41:20 2012 -0800

    am 0b65fac4: Revert "TransferQueue: use a few extra buffers"

    * commit '0b65fac4a7c89746750cffe7ffc0aebd6c3449fd':
      Revert "TransferQueue: use a few extra buffers"

commit 0b65fac4a7c89746750cffe7ffc0aebd6c3449fd
Author: Chris Craik <ccraik@google.com>
Date:   Thu Nov 15 15:16:27 2012 -0800

    Revert "TransferQueue: use a few extra buffers"

    bug:7549630
    bug:6876502

    This reverts commit 923f222d2281bf1faac6221b3fb1298940a6d205.

    Change-Id: I232a5b5b077dc1046ff2d6272876a5e5b441d42c

commit fb622c6a6e1a348af90d80870986c8633eaae4d4
Merge: 94c6443 3dddfd8
Author: Glenn Kasten <gkasten@google.com>
Date:   Wed Nov 7 08:04:15 2012 -0800

    Merge "Remove reference to old AudioTrack::Buffer fields"

commit 3dddfd8c492f7562dcf602f4d200fbb46d451805
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue Nov 6 13:45:07 2012 -0800

    Remove reference to old AudioTrack::Buffer fields

    Buffer::channelCount and Buffer::format are going away

    Change-Id: Iaeea5b80e6e0012e155591b125fc6a7d01c990d4

commit 94c6443411ff86f8bd7b111290806188d141ce2d
Merge: 815598b e1e9db5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:29:16 2012 -0800

    am e1e9db52: (-s ours) am 322b9737: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'e1e9db52f8df0681114665b56368f7b19449ee33':

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 815598bd61964d2ee231a57c9391a589220beb50
Merge: 3028d0c 98ee7b8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:19:17 2012 -0700

    am 98ee7b8a: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '98ee7b8a5eb2c89439d7cdab914cc7b3d862f8b0':
      TransferQueue: use a few extra buffers

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 3028d0c04c1cc96432e3405f9f429f36a15575ad
Merge: 9a5c25f 8c0e5df
Author: Junichi Monma <monma@google.com>
Date:   Tue Oct 30 17:53:42 2012 -0700

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

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

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 9a5c25f8894da7ec3dc952f17bb0ae3fd0cc114f
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue Oct 30 10:58:27 2012 -0700

    Remove obsolete references to libmedia_native

    Bug: 6654403
    Change-Id: I30248c1469a7fafadec59e091feb230c75a38d54

commit a5c3c3c24c180a13de898b0c64dc26ef3f3bc7a9
Merge: e8ee819 4acf298
Author: Jamie Gennis <jgennis@google.com>
Date:   Thu Oct 25 18:19:08 2012 -0700

    am 4acf298a: am 923f222d: TransferQueue: use a few extra buffers

    * commit '4acf298a95b9078ce6c74e343103ec68174adb32':
      TransferQueue: use a few extra buffers

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 e8ee8192491eacac7523061ab0266c81f2249856
Author: Bo Liu <boliu@google.com>
Date:   Fri Oct 5 11:05:38 2012 -0700

    Remove CacheManager implementation

    CacheManager will not be implemented in webviewchromium. So removing
    existing implementation in WebViewClassic.

    Change-Id: I2cee2dc5cd567fe96f5a11353c009599fe23c973

commit cf130c410705f5e33a621db6541e9d43790772cd
Merge: 22faebd 46ea112
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 23 11:52:16 2012 -0700

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

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

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 22faebd2a24d33a9499019644ec938b09811b1c8
Merge: ca18bed 46d5a9c
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 22 15:58:17 2012 -0700

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

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

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 ca18bedc63dda9b9d73230da91ee318804796c53
Merge: cbd1238 fabdfa6
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 16 15:31:01 2012 -0700

    am fabdfa62: am 285c0572: Add src rect ptr null check

    * commit 'fabdfa62512eaf9a96b899915ded677622a23ecb':
      Add src rect ptr null check

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 cbd1238e79dce276fdc71870267ce3a4a7968e53
Merge: 0e637d3 4ea6ae7
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Oct 10 09:26:40 2012 -0700

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

    * commit '4ea6ae7d16f731532d5ab93de637581ec4dc74f8':
      DO NOT MERGE Control access to inherited methods of jsinterface objects

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 0e637d37cd7e7e7c51d80f5349c347cd9eb60725
Merge: 18d24a7 cbadc1b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:32:02 2012 -0700

    am cbadc1b3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'cbadc1b3028cd4610f9285f8dbc102cc4cdc1556':

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 18d24a7d216a8370798be13b3a19caf45e2106c1
Merge: 4e5a539 c8169b8
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 8 16:22:03 2012 -0700

    am c8169b8a: am 3430821e: Deep copy animation keyframe names

    * commit 'c8169b8acf598f836f1945f1a29d901afaac96c0':
      Deep copy animation keyframe names

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 4e5a53989c4bf85c3d03e000f75115bfc78d8dc8
Merge: bf8fc8e d0558f5
Author: John Reck <jreck@android.com>
Date:   Mon Oct 8 12:33:45 2012 -0700

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

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

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 bf8fc8ed449bd26c5c6fff1e75c760ddc15ae910
Merge: 87c801c 100f6d5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:49:50 2012 -0700

    am 100f6d54: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '100f6d546cc912e42631baf01b581d0ca28489ae':

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 87c801c4202931e8ab72bf38a4e5de3b9ad9928f
Merge: aedce8b 9c876df
Author: Chris Craik <ccraik@google.com>
Date:   Wed Oct 3 10:15:16 2012 -0700

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

    * commit '9c876df700ae53c4b71eef008894d91a54733d65':
      Prevent fixed background layers for iframes

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 aedce8b8859d648bf3dc9216276ce783f8fcd635
Merge: e3600fe fc36f7a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:36:25 2012 -0700

    am fc36f7ad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'fc36f7ad4f079caae20009dca0a24ae54180171e':

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 e3600fe58d452c240acdc155a39ecfdad6132e98
Merge: 36f4f4e 448d632
Author: Chris Craik <ccraik@google.com>
Date:   Tue Oct 2 17:00:52 2012 -0700

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

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

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 36f4f4e6d64f5e6b797fc66d97226e9167cb1481
Merge: 267abdb 3bf407e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:21:20 2012 -0700

    am 3bf407e6: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '3bf407e639fda627d869b7c6899928bf6963434f':

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 267abdb64c2c2a5391818d582406660750e70586
Merge: c389f24 41eeed1
Author: Chris Craik <ccraik@google.com>
Date:   Mon Oct 1 13:47:45 2012 -0700

    am 41eeed12: am 42326004: Determine maxZoomScale from bitmap/text drawing

    * commit '41eeed12bb95d898adc020201d6a6d36210e70bd':
      Determine maxZoomScale from bitmap/text drawing

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 c389f24fc752dc9693b14b8e9532202688cb4289
Merge: 169ee81 bd501a1
Author: Chris Craik <ccraik@google.com>
Date:   Fri Sep 28 00:35:17 2012 -0700

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

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

commit 169ee8181ac6a0a1352502408f7397f914865da7
Merge: 48bc13b 06722d9
Author: Chris Craik <ccraik@google.com>
Date:   Fri Sep 28 00:33:20 2012 -0700

    am 06722d95: am 98f974e6: Force stroke style for radio drawing

    * commit '06722d95519ce8f817c36cd3ebe9e6f944552447':
      Force stroke style for radio 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 48bc13b149609f6bd9630ab5ba55c8b3ffa7b6b8
Merge: 7eb0ccd 56adb81
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 12:48:55 2012 -0700

    am 56adb811: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '56adb811a83752c05cff7218ff3ef9ac9f0c461b':

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 7eb0ccd83db2d6c7a8b2d861656a95c3576d287f
Merge: 787d7e4 ae73b55
Author: John Reck <jreck@google.com>
Date:   Thu Sep 13 14:13:11 2012 -0700

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

    * commit 'ae73b55474a7a13cb0dd60e7eb5bb47124ba61ee':
      Paint into the right PicturePile

commit 787d7e4ba5f5cf5d77f66dd05b96902be3b839f5
Merge: 19bc303 f2e6907
Author: John Reck <jreck@google.com>
Date:   Thu Sep 13 14:13:08 2012 -0700

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

    * commit 'f2e6907a172e98146a2b7c3d626991fbe6b39a53':
      Remove broken RLE path

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 19bc303924b798720201328b960f60f842dda546
Merge: d71e3b9 8d5f336
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 16:58:57 2012 -0700

    am 8d5f336a: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '8d5f336a2e2adc08f3b2b4d4d1f4c96998d3f3f0':

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 d71e3b965b86f1cd94067679e230ba4e1f106e18
Merge: 6ec1694 b9edf44
Author: Selim Gurun <sgurun@google.com>
Date:   Mon Sep 10 18:21:10 2012 -0700

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

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

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 6ec1694dae664df1ff5d7c8eee6343f3b0426feb
Merge: 0f0310c 2563020
Author: Chris Craik <ccraik@google.com>
Date:   Mon Sep 10 17:16:55 2012 -0700

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

    * commit '2563020f0704e4cae3260c5262b1966568357fc3':
      Disable clipping painter when painting 400+ operations

commit 0f0310c6c4614dbb2340c5f901fb39e2693897c1
Merge: 98c43d1 e567df4
Author: John Reck <jreck@google.com>
Date:   Mon Sep 10 17:05:27 2012 -0700

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

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

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 98c43d1199e4127417062f1c5085330c373c5d66
Merge: c989de7 8064aa0
Author: John Reck <jreck@google.com>
Date:   Thu Sep 6 09:40:19 2012 -0700

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

    * commit '8064aa0f51097cb37966b098b1da4381e88c384f':
      Update RenderThemeAndroid drawing

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 c989de7a7f0f6178a124b19136aa88349d9dbd7a
Merge: ff0a90e f91651d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:12:05 2012 -0700

    am f91651d1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'f91651d1813ec92e7cb6c02b1d0ac51e198fe7b0':

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 ff0a90e120335cda3f7da686fa3faba340ad5c60
Merge: ee66bb3 342811a
Author: John Reck <jreck@android.com>
Date:   Tue Sep 4 16:05:31 2012 -0700

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

    * commit '342811af674a02443bf7249128f17ccfb712544e':
      Remove inconsistency between HistoryItem writing/reading

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 ee66bb3fb2564212dd6effefd140627eef63e069
Merge: 0fa187a 7db6acf
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 31 15:12:01 2012 -0700

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

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

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 0fa187afacdf34aaa64bdf91855fd609624f330a
Merge: 4508681 5c57bc4
Author: John Reck <jreck@google.com>
Date:   Fri Aug 31 13:20:48 2012 -0700

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

    * commit '5c57bc4a3d8b312d76fd8edcabc8d0067bb40177':
      Fix initialization

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 450868135a0c3ac868e348c1927fda799e610334
Merge: a50d57c 532faa1
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 31 12:00:32 2012 -0700

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

    * commit '532faa1619cf025ecd62b0f35b360b758171a50b':
      Fix potential corruption/leak in cookiejar.

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 a50d57c11941cdfc91ad9e42ca1e8522d79d0b55
Merge: 905f51f 67ef848
Author: John Reck <jreck@android.com>
Date:   Fri Aug 31 10:23:25 2012 -0700

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

    * commit '67ef848790db48e71978667708b9cf1e874bb393':
      Crash on Orange media portal

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 905f51fe81f84a70083a7aba7c11932405113869
Merge: 7c12a11 bc943ef
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Aug 30 10:53:55 2012 -0700

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

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

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 7c12a11e9d7c115ae37925326e6fe515f0f4f8e8
Merge: 9630b26 f8403ab
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Aug 30 08:34:40 2012 -0700

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

    * commit 'f8403ab14a43cd145113bb5758e3901d309e576d':
      webkit: enable no-pic compiling option

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 9630b2680202aa21565e647346647f0ddcd03ae1
Merge: 5789920 832e918
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Aug 29 15:41:12 2012 -0700

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

    * commit '832e9182c58eeaa6cb74a3eacc244e7956eeba07':
      Provide referer when download requested

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 5789920b990050232014f44b8380eec50840eedc
Merge: 014bc9c 89ca519
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Aug 28 13:02:22 2012 -0700

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

    * commit '89ca519416db201a7367b1d18fca3b0577dc7727':
      Fix memory leak caused by CSSRuleList wrapper

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 014bc9ceda42e5eff790554f481b9540062d8d98
Merge: 456ab62 b07f7c4
Author: Jeff Brown <jeffbrown@google.com>
Date:   Mon Aug 27 17:20:02 2012 -0700

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

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

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 456ab628fdf0a6ccabd7fd092136e891ba3c3dba
Merge: 510e75a 8ab9b9d
Author: George Mount <mount@google.com>
Date:   Mon Aug 27 13:09:24 2012 -0700

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

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

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 510e75abdfb9f4bea00b0310c603ffca3366cc71
Merge: ca9148d 9f15cf2
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 27 10:11:50 2012 -0700

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

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

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 ca9148d662a6449e87e5f1cf8cadec9aa5f6d714
Merge: 1670f6d 831d03f
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 24 11:40:36 2012 -0700

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

    * commit '831d03ff73bbf0a8277c7f25b149413887667f90':
      Only use the clipping painter when painting to a bitmap.

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 1670f6dbbf9e4544a2d34b2febbbed9317a87db8
Merge: f8a97c7 8c6b432
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:09:47 2012 -0700

    am 8c6b4325: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '8c6b4325e8fac73b9e59e3feacfb6dbe47983370':

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 f8a97c728af13c622972bf6592b4866481a5ba8d
Merge: 1eb0c13 7553e92
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 20 14:31:30 2012 -0700

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

    * commit '7553e92e8018f9d42610118190bfcafc081fac76':
      Exit fast tile swap mode immediately upon SurfaceCollection swap

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 1eb0c13b923f8d9730b1a7ac66425d9d1c96676d
Merge: 19f3503 129aa48
Author: Victoria Lease <violets@google.com>
Date:   Mon Aug 20 13:16:43 2012 -0700

    am 129aa481: (-s ours) am a3546a89: Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-dev

    * commit '129aa481cc9f2f8c6ac47d9273b1c56a408f5637':
      DO NOT MERGE Text locale compatibility shim

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 19f3503bc728f073c60f3c923a52d3316d94df8a
Merge: 169caeb 86ec0ec
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 20 12:35:08 2012 -0700

    am 86ec0ec2: am bf9a9798: Fix opaque operation area calculation

    * commit '86ec0ec2e1bd16df8e0d7245b1e7e5deb85a1c30':
      Fix opaque operation area calculation

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 169caeb23ab4e872c9758f8ac562d6ef33376c08
Merge: 71b20b0 cf5f8f1
Author: John Reck <jreck@google.com>
Date:   Fri Aug 17 18:23:46 2012 -0700

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

    * commit 'cf5f8f136a340b884a9b894893d826ab58180be6':
      Support partial invals on layers

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 71b20b0acfab533fc3780adc7032bfc1128d822f
Merge: 4be5016 3bcbc96
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 17 18:08:18 2012 -0700

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

    * commit '3bcbc968b8ed9a7677e0f7fe9a35fa169a445ffc':
      Early return from layer painting when fully clipped

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 4be50168232f74f5e4db507404e173a0e5c06c4f
Merge: 10456c4 c4519a9
Author: Victoria Lease <violets@google.com>
Date:   Fri Aug 17 10:09:19 2012 -0700

    Merge "Text locale compatibility shim"

commit 10456c40fd46925be76ed7fff24352aa6ff1f380
Merge: 2fa0e58 70dfbb2
Author: Joe Onorato <joeo@google.com>
Date:   Fri Aug 17 00:24:42 2012 -0700

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

    * commit '70dfbb2cf3a7ab8d948779de5d29e664028f856e':
      host modules don't need LOCAL_MODULE_TAGS

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 2fa0e58212f16cd48640b4bb19e522865df52838
Author: Joe Onorato <joeo@google.com>
Date:   Fri May 18 20:11:29 2012 -0700

    host modules don't need LOCAL_MODULE_TAGS

    Change-Id: I52f9c80418f9960e463664096f98bcbcf79ecc6b

commit df1d11c9eac9b78b487d13e891f5e479f5ec95e4
Merge: 85d388d aa141fc
Author: John Reck <jreck@google.com>
Date:   Thu Aug 16 19:34:39 2012 -0700

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

    * commit 'aa141fc9151202525ca6c8796c1f5d213221fc55':
      Fix SIGBUG due to misalignment

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 85d388dd91a7b8a000b373e25226756eaad0ebc1
Merge: 66ef487 7fbdb98
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:13:03 2012 -0700

    am 7fbdb985: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '7fbdb98508fc2851c5d4a46d03d78a2b2fd881e2':

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 66ef4879b07750870dec07940e043362685edb21
Merge: 4994ebf 06368aa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:04:35 2012 -0700

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

    * commit '06368aac5004406f6cab3e8e3df737f0af5a121f':

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 4994ebf3b0805070728ea83ade253830a6d7e248
Merge: f14dad6 2bd50df
Author: Chris Craik <ccraik@google.com>
Date:   Thu Aug 16 16:26:27 2012 -0700

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

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

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 f14dad6fbe50a308d05b4f6dba9df26fafb8147d
Merge: 7f3f170 f760107
Author: John Reck <jreck@google.com>
Date:   Thu Aug 16 15:39:12 2012 -0700

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

    * commit 'f760107e6853501c61e480b01d218ad4bb1aa14a':
      Memory allocation changes

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 7f3f1700872bc6081acf978c5c9208a499d5165a
Merge: 9167b01 486f8ab
Author: Chris Craik <ccraik@google.com>
Date:   Wed Aug 15 15:49:48 2012 -0700

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

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

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 9167b011d136e4920e97faaee1bca1f8852ea103
Merge: 734260e c93bd5b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:29:24 2012 -0700

    am c93bd5bd: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'c93bd5bd7fa866f13e0dcf2d8dca8b9cd273b018':
      Null check

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 734260ed5a85ec089e2bac6d7e6bb71549ddcb26
Merge: 5293add 164f732
Author: George Mount <mount@google.com>
Date:   Wed Aug 15 07:50:33 2012 -0700

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

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

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 5293addf9a9cc3624f9826982dedfe3d4e65ee85
Merge: 0fd271e 03e29ab
Author: John Reck <jreck@google.com>
Date:   Tue Aug 14 17:05:06 2012 -0700

    am 03e29ab1: am 682a85cb: Move text allocations to LinearAllocator

    * commit '03e29ab101f98262b3e7c6963cdee6e2d59774b9':
      Move text allocations to LinearAllocator

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 c4519a9c7a2b85fcd0f4e2eea66e6d6a76b52a31
Author: Billy Hewlett <billyh@google.com>
Date:   Fri Jul 20 13:49:05 2012 -0700

    Text locale compatibility shim

    This change allows WebView to continue to function as before,
    displaying text using the system default fallback font chain.

    Change-Id: I2a69f2834ca50c37302dcd4816edb630b1208a41

commit 0fd271e44c657b5aa5494517b493a3703331ae77
Merge: 6c568d2 1df0476
Author: John Reck <jreck@google.com>
Date:   Tue Aug 14 11:44:33 2012 -0700

    am 1df0476f: am b0a56fa3: Memory usage improvements

    * commit '1df0476ffdfe1cec82cea6f9cca12f4a5d2e1e03':
      Memory usage improvements

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 6c568d294a2124a782be32564be74e2f786a0cf2
Merge: c9f5dca 9f6c4ed
Author: John Reck <jreck@google.com>
Date:   Mon Aug 13 17:07:03 2012 -0700

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

    * commit '9f6c4ede672f3cf35b4afeba55c47984c6f9863c':
      DO NOT MERGE Null check

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 c9f5dca5b3ca9f57c7e040a0511eebabaaa0560a
Merge: e407b5b 3aa8129
Author: John Reck <jreck@google.com>
Date:   Mon Aug 13 15:38:37 2012 -0700

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

    * commit '3aa8129f5303d25cd895038d61d45e8ce1b4c244':
      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 e407b5b278dd4f5d183ed28e0dbcdc9cd1322897
Merge: e63ecb4 9333ff0
Author: Chris Craik <ccraik@google.com>
Date:   Mon Aug 13 09:51:46 2012 -0700

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

    * commit '9333ff0afbc604f0a813a028add9db58ad27761a':
      Improve in-canvas pure color checking

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 e63ecb437082c071d9af93ef2755003b39cef670
Merge: 2c51c8a e8370a9
Author: John Reck <jreck@google.com>
Date:   Fri Aug 10 15:41:41 2012 -0700

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

    * commit 'e8370a99989ee76752c83d39b3f76952336b2ac8':
      Clear mOperationState when calling popState

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 2c51c8afd33c30d4d1aae56ff36018b6a5d4637f
Merge: b9fd474 ab15a97
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 12:44:06 2012 -0700

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

    * commit 'ab15a9766fb1d76ae2eb3aa71e286d774df0fc4e':

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 b9fd474ab62704697f28883de0d0f51e0da442ea
Merge: eed37ba b67bd5f
Author: Chris Craik <ccraik@google.com>
Date:   Fri Aug 10 10:43:02 2012 -0700

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

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

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 eed37ba953f699c714b3818b12ec6974952dd874
Merge: ce660f6 1035420
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:55:45 2012 -0700

    am 1035420e: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1035420e194f84f17408032a85ce977ed12549f5':

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 ce660f68ae7af678c7871f7dcac0cd3ce566da64
Merge: e8e2865 4f82601
Author: John Reck <jreck@google.com>
Date:   Thu Aug 9 10:41:43 2012 -0700

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

    * commit '4f82601ffbd97980a8118f1e85567b7ce220eaf3':
      DO NOT MERGE Fix memory leak

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 e8e28654d968982e4bb1b061cc0ea2a3680c94c3
Merge: 2dccd96 187ff87
Author: Chris Craik <ccraik@google.com>
Date:   Thu Aug 9 09:33:09 2012 -0700

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

    * commit '187ff87e6a3d0cadbf41d964e6655ab579e13a12':
      Clip out opaque regions to avoid double painting

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 2dccd96221e5174ad8443e59b44a7d2d65c6aa14
Merge: 2afd1db 5229116
Author: John Reck <jreck@google.com>
Date:   Wed Aug 8 17:41:14 2012 -0700

    am 52291168: am ddb9860f: Fix memory leak

    * commit '522911687acedcaaf23518b396cb14efe67fa2a9':
      Fix memory leak

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 2afd1db246c5154dbb71df131478c83a2a660286
Merge: 7d4a014 7c998e6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:18:54 2012 -0700

    am 7c998e67: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '7c998e67cad51e503f89cfd830ba4e8bd3bf68ab':

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 7d4a014d7d179e21a34ef3d71279ee7245e7859f
Merge: a283fea 3ba661c
Author: Chris Craik <ccraik@google.com>
Date:   Tue Aug 7 17:26:48 2012 -0700

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

    * commit '3ba661c2ee40c0cb01d58966c712184db6eb9ff0':
      Reset cached opacity on shader swap

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 a283fea5792e8e5d579865bff3ae132a1f84f833
Merge: 90b4912 32a0a22
Author: John Reck <jreck@google.com>
Date:   Tue Aug 7 15:22:45 2012 -0700

    am 32a0a227: am a78491ed: Add extra null check

    * commit '32a0a227c211119a6655615bee1adf0be3a9645b':
      Add extra null check

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 90b49127d5bce442939c3cc13a749a361c03c38d
Merge: cd40a67 e007f77
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:05:53 2012 -0700

    am e007f772: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'e007f77254a6e7b2af8938331b49e0dbd8ae7c2f':

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 cd40a67c5bad3cea9ead24d5d8c9774fb0a14844
Merge: 3e33103 76882e8
Author: John Reck <jreck@google.com>
Date:   Mon Aug 6 17:54:57 2012 -0700

    am 76882e89: am 3718b58e: Remove usages of getCanvas

    * commit '76882e8904f7d2f7f20417cfe988530e17c82441':
      Remove usages of getCanvas

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 3e33103ec38595f9c78df9f94ad96b0a9f35ba25
Merge: 0e228f8 89a4289
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:21:40 2012 -0700

    am 89a42891: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '89a42891d16d3acd49995ee937b84c46736ca975':

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 0e228f8806caf7467595c5f758e23529ad749f11
Merge: 2684c51 24d4bd1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 14:00:03 2012 -0700

    am 24d4bd10: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '24d4bd10da6bf919fdf855cf1707648205866c59':

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 2684c51519cae1ffa05152119e50a73c0508ba4f
Merge: 2292283 0d02751
Author: John Reck <jreck@android.com>
Date:   Thu Aug 2 15:45:47 2012 -0700

    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

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 2292283d4f8b04c41c679bc0b1aaeaa53b98859a
Merge: f6655d1 f1d82a9
Author: George Mount <mount@google.com>
Date:   Thu Aug 2 15:10:06 2012 -0700

    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.

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 f6655d17379f2d17ea91eaa390a6fc575d334e09
Merge: a9e11ef ae5704e
Author: John Reck <jreck@google.com>
Date:   Wed Aug 1 18:32:20 2012 -0700

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

    * commit 'ae5704e5d67caa1a13d68d3dd9438ac5f4f89a1f':
      Tweak shadow settings

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 a9e11efc100e8acc8b7dcc5e4b27d42a5cd1b2c5
Merge: e73a01a 22e467f
Author: Elliott Hughes <enh@google.com>
Date:   Wed Aug 1 17:25:06 2012 -0700

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

    * commit '22e467fcbbf5aed395880faa01f5976729d670c4':
      Fix build by adding missing #include.

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 e73a01a9d2858b91627467d9e0e5fc3e3e3dd168
Merge: 27d9cb9 1f3ede9
Author: Nicolas Roard <nicolasroard@google.com>
Date:   Wed Aug 1 14:55:25 2012 -0700

    am 1f3ede9c: am 95e32410: Optimize recompute bounds checks

    * commit '1f3ede9c94d32a4d9604499a6a1995f631ded126':
      Optimize recompute bounds checks

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 27d9cb9c915416a731161ba1a70e5e944d9febbc
Merge: c24ed3d ab17631
Author: John Reck <jreck@google.com>
Date:   Wed Aug 1 11:33:43 2012 -0700

    am ab176313: am 887267ba: Fix PicturePile size adjust path

    * commit 'ab17631320ed00fae606f6eba0969ceb83559b34':
      Fix PicturePile size adjust path

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 c24ed3d9584236f61766b18f993b2a55669777d9
Merge: aecb1da 044d3aa
Author: George Mount <mount@google.com>
Date:   Wed Aug 1 10:45:43 2012 -0700

    Merge "Allow numeric entry fields to have placeholder text."

commit aecb1dafd091b77d344b524d0b2b91493bc73a3c
Merge: 859e5c9 9a84e52
Author: John Reck <jreck@google.com>
Date:   Tue Jul 31 17:52:21 2012 -0700

    am 9a84e528: am 74d16a76: Memory cleanup

    * commit '9a84e528024f7f944ff5b9d2d28539d0ea7c013a':
      Memory cleanup

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 859e5c9b9cd7b28c5046bd02c82f23616d8a7ca5
Merge: 28f30eb 89a6e50
Author: John Reck <jreck@google.com>
Date:   Tue Jul 31 17:19:25 2012 -0700

    am 89a6e505: am d9779adc: Switch GraphicsOperation to LinearAllocator

    * commit '89a6e5053e990e0977f67ade4ff6684938f5afe7':
      Switch GraphicsOperation to LinearAllocator

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 044d3aa44d941fea350780ad07c78179d5f5811a
Author: George Mount <mount@google.com>
Date:   Tue Jul 31 15:11:10 2012 -0700

    Allow numeric entry fields to have placeholder text.

     Bug 6712551

    Change-Id: I0e43bb223dc2646d6d78f6135f502b75066e6449

commit 28f30eb07928e834819523aa8a502cf70de27ac3
Merge: 39ad8c0 81730a4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:05:52 2012 -0700

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

    * commit '81730a4f5b38d20a227012b7023e0f4bd5151371':

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 39ad8c0013cb86b7afc2cdd3037c1daee8f5f047
Merge: 19d0758 b1f6b18
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:10:49 2012 -0700

    am b1f6b188: Reconcile with jb-mr1-release

    * commit 'b1f6b1885edf2df16b47fed92ad29c39d626fd01':

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

commit 19d07584aa97e207fbc413f39081fdf0234cc320
Merge: 9b4b8a1 c514bac
Author: John Reck <jreck@google.com>
Date:   Mon Jul 30 09:04:50 2012 -0700

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

    * commit 'c514bacb0f4890026568d104f85ebba563bbe930':
      Don't use SkPicture for DrawText recording

Change-Id: Ided73c4e73291a05c98fc29294d245e81832ddb1