Raph Levien
41f7f9c5bc
am fdd40823: am 22a3344c: Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
...
* commit 'fdd408233db5bd70cb43ddf2a49a85bd748da5b9':
Fix for bug 8695466 GPOS combining mark positioning broken before space
2013-04-23 15:02:04 -07:00
Scott Main
39fc3dc026
am 4d4eb732: am 89a60814: am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '4d4eb732ec0c21227284a70f9a718008b7f6995e':
make Google IO image clickable
2013-04-23 15:01:57 -07:00
Selim Gurun
872d7665f7
am cf633a4c: am 6981f11f: am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'cf633a4c45b344ccb3f844afc6f6e0883cc5db83':
DO NOT MERGE Fix issues during backport
2013-04-23 15:01:54 -07:00
Ian Rogers
6220475fb5
am 4d355c39: am 282a7e1b: Adding matching @deprecated.
...
* commit '4d355c39a7c2bacdcfbbb1691e5d0b28362c4e9c':
Adding matching @deprecated.
2013-04-23 15:01:50 -07:00
Ian Rogers
023c1f4a1e
am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."
...
* commit '896ee5b6f8354567464a371025088156ed49bc32':
Adding matching @deprecated.
2013-04-23 15:01:30 -07:00
Raph Levien
fdd408233d
am 22a3344c: Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
...
* commit '22a3344cda1a3dcf4f719e0685c5d06155922c29':
Fix for bug 8695466 GPOS combining mark positioning broken before space
2013-04-23 14:21:44 -07:00
Raph Levien
22a3344cda
Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
2013-04-23 21:19:20 +00:00
Raph Levien
9d47db23ff
Fix for bug 8695466 GPOS combining mark positioning broken before space
...
This patch makes segmentation into script runs behave the same in RTL
as in LTR modes - so that inherited script characters are always
associated with the preceding run. Otherwise, for a sequence such as
u+0631 u+064d u+0020, it would get split after the first character,
which would lose the ability to correctly position the u+064d mark.
Change-Id: I3c12ba1b77d18334f55e707f518be1046e6b339b
2013-04-23 12:51:27 -07:00
Scott Main
4d4eb732ec
am 89a60814: am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '89a6081447fc5c454aad3aea02190a576d92ca1b':
make Google IO image clickable
2013-04-23 12:43:57 -07:00
Scott Main
89a6081447
am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '2dd874ace63566892a58f43bcf15399ae66c8d4b':
make Google IO image clickable
2013-04-23 12:41:40 -07:00
Scott Main
2dd874ace6
am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit 'e04458816b296ea76fc16cf8a820969cf363051d':
make Google IO image clickable
2013-04-23 12:39:18 -07:00
Scott Main
e04458816b
am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '51a452a93bb170a65921aae9ae6bddbf8ce12bff':
make Google IO image clickable
2013-04-23 12:37:35 -07:00
Scott Main
51a452a93b
am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '4af72165092fb965ec9a97599f25538aa70242b1':
make Google IO image clickable
2013-04-23 12:36:26 -07:00
Scott Main
4af7216509
am 7653fbee: make Google IO image clickable
...
* commit '7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
make Google IO image clickable
2013-04-23 12:34:30 -07:00
Scott Main
7653fbee7e
make Google IO image clickable
...
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
2013-04-23 12:32:24 -07:00
Selim Gurun
cf633a4c45
am 6981f11f: am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '6981f11f3080eaa4a6590005ad464474b0fc1a18':
DO NOT MERGE Fix issues during backport
2013-04-23 12:31:20 -07:00
Selim Gurun
6981f11f30
am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '2253105c1ad6c93880b3ce1651cf54269711cff7':
DO NOT MERGE Fix issues during backport
2013-04-23 12:27:03 -07:00
Selim Gurun
2253105c1a
am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'cab09cfc7afb7e19698bed3d61fe0b200dad3e4a':
DO NOT MERGE Fix issues during backport
2013-04-23 12:24:37 -07:00
Selim Gurun
cab09cfc7a
am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
DO NOT MERGE Fix issues during backport
2013-04-23 12:23:14 -07:00
Selim Gurun
dc9efbbb61
am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'a5f4e79fad39b4a0f91673c5813b1740e82144f4':
DO NOT MERGE Fix issues during backport
2013-04-23 12:21:49 -07:00
Selim Gurun
a5f4e79fad
am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '22a946d36af4ea69956531c89f0d0852497c3892':
DO NOT MERGE Fix issues during backport
2013-04-23 12:20:53 -07:00
Selim Gurun
22a946d36a
am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
DO NOT MERGE Fix issues during backport
2013-04-23 12:18:47 -07:00
Ian Rogers
4d355c39a7
am 282a7e1b: Adding matching @deprecated.
...
* commit '282a7e1b1db121c910f25b13081242a8c7611708':
Adding matching @deprecated.
2013-04-23 12:04:25 -07:00
Ian Rogers
282a7e1b1d
Adding matching @deprecated.
...
Bug: 8657266
(Cherry-pick of c2a3adbd56 )
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
2013-04-23 11:36:28 -07:00
Selim Gurun
006119bf2c
Merge commit '8237dd82' into manualmerge
...
Bug: 6923539
Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03 . A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b . The conflict occurs while
merging 8237dd82bf which I thought was
DO NOT MERGE anyway.
Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
2013-04-23 11:19:12 -07:00
Chet Haase
7aea41b3d6
am 393abb1c: am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
...
* commit '393abb1c54c6b847b81e2390efcd6ec95e8237f8':
Expand invalidation rectangle when clipChildren == false
2013-04-23 11:16:25 -07:00
Jean-Michel Trivi
0169b26adf
am 448c6ca4: am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
...
* commit '448c6ca48144b324ca1e98962bd5dd06451a355e':
Identify in logs launch of voice search from key events
2013-04-23 11:16:22 -07:00
Daniel Sandler
bf7b95cec9
am 2fd0ba8e: am f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
...
* commit '2fd0ba8e9529780fd87b71a024edb3200ad1d93a':
Fix concurrency issues when parceling StatusBarNotifications.
2013-04-23 11:16:19 -07:00
Amith Yamasani
027587b486
am b2daf811: am d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
...
* commit 'b2daf811cb39e8e38a31065c7ffb11d0926ffcef':
Listen for brightness dialog broadcasts from all users
2013-04-23 11:16:16 -07:00
Dirk Dougherty
0ff0c3c488
am 5fbf40b1: am 94aa1167: am 80177e0c: am c2340c4d: am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit '5fbf40b12863965d68a1759b639802c23c651235':
Doc change: update support urls.
2013-04-23 11:16:14 -07:00
Nick Pelly
dfe49e9c9f
am 09e9e1a5: am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
...
* commit '09e9e1a5e7e3dd161b73f4254f239cab0410438a':
Add ContentValues & CursorWindow to framework.aidl
2013-04-23 11:16:11 -07:00
Michael Wright
058feb4e1d
am 58500051: am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
...
* commit '585000515faacc02736f920425ae6c323223ee58':
Rewrite input handling for native applications
2013-04-23 11:16:08 -07:00
Svetoslav
7ac47e8acb
am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
...
* commit '7bf02d1255e86becb225ba70ca3ea8b2af90c166':
Making new node id APIs return strings.
2013-04-23 11:16:05 -07:00
Jean-Michel Trivi
a7473ab28c
am cb315af3: am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
...
* commit 'cb315af34be49859a0bfda6ee808550671a5e416':
Opt-in mechanism for RemoteControlClient position anti-drift check
2013-04-23 11:16:03 -07:00
Dianne Hackborn
eadbcd3352
resolved conflicts for merge of 8c3cb811 to master
...
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
2013-04-23 10:56:23 -07:00
Ian Rogers
896ee5b6f8
am be4536d2: Merge "Adding matching @deprecated."
...
* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
Adding matching @deprecated.
2013-04-23 09:15:58 -07:00
Ian Rogers
be4536d214
Merge "Adding matching @deprecated."
2013-04-23 15:13:05 +00:00
Philip Milne
e11d9ed3ec
am 089a75be: am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
...
* commit '089a75be5e33e13071754a727902224b6db60168':
Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
2013-04-23 04:46:31 -07:00
Chris Craik
289057a294
am 4837ea99: am 8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
...
* commit '4837ea99c46e792e5f4d55e895c63d415888f1b4':
Expand hardware accel doc
2013-04-23 04:46:28 -07:00
Robert Greenwalt
75a1cac2bf
am f12afa99: am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
...
* commit 'f12afa9913ac75af724d9700ff85dc68b1e0cd45':
Listen for network disconnect.
2013-04-23 04:46:25 -07:00
Dirk Dougherty
c626f95ad6
am afd80ab6: am 3acb320f: am ab3b13eb: am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit 'afd80ab6a60e57011fa218c930bcfa8345c88a4e':
Doc change: update payment detail for merch account.
2013-04-23 04:46:23 -07:00
Christopher Tate
fb4f2890e8
am 4c6f2a54: am 7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev
...
* commit '4c6f2a54109c3f75deca1f2b43736dcd9c965768':
Don't attempt native crash reporting for persistent apps
2013-04-23 04:46:20 -07:00
kmccormick
07ff1d1307
am 7fccb942: am 47cccbd0: am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit '7fccb94248514fc1037985330e6f4f0b0cc5ce3f':
Doc update: Fix firewall text.
2013-04-23 04:46:17 -07:00
Scott Main
f712987a4c
am 5ced567d: am 3fadd4c2: am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
...
* commit '5ced567d768ae68796e017a2e1e5e72f7f22fef3':
fix backup registration url external bug: 54539
2013-04-23 04:46:15 -07:00
Baligh Uddin
7f289ae3bf
am 1aaef016: am b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1aaef016fade071b7bd61763bf4ffb5a2b853713':
Import translations. DO NOT MERGE
2013-04-23 04:46:12 -07:00
Dianne Hackborn
53ac712a80
am e89dcf33: am 3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
...
* commit 'e89dcf33e12ee9d57636adf1ccc37aca44d3c311':
Assign final resource IDs for JB MR2.
2013-04-23 04:46:09 -07:00
Scott Main
522de2c771
am c87dd640: am 9753ef1e: am 35ac5b08: am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
...
* commit 'c87dd6409253b4dfdc90c9d4f053f4c508d8cdfa':
delete unused download page and add a couple search tags
2013-04-23 04:46:06 -07:00
Zhentao Sun
c11a7e614c
am 04375db6: am c5fc9988: Made it easier to disable overlay mechanism of location components.
...
* commit '04375db65302fabcf7101ecc4e1e6e38700baba5':
Made it easier to disable overlay mechanism of location components.
2013-04-23 04:46:03 -07:00
Chet Haase
393abb1c54
am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
...
* commit '5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
Expand invalidation rectangle when clipChildren == false
2013-04-23 03:52:28 -07:00
Jean-Michel Trivi
448c6ca481
am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
...
* commit 'ea236f19e652942a7af384566c70cdd0c7f88c58':
Identify in logs launch of voice search from key events
2013-04-23 03:52:12 -07:00