git.osdn.net Git - android-x86/frameworks-base.git/log

Eric Laurent [Tue, 30 Oct 2012 17:14:56 +0000 (10:14 -0700)]

am d38f8170: am 7066b888: am c864d952: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit 'd38f8170fa1c6c15e03a561e81f39faa8c7ff261':

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 30 Oct 2012 17:14:52 +0000 (10:14 -0700)]

am c9a9ec3b: am 805345b2: am f1c62be6: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev

* commit 'c9a9ec3ba4d835935d25c2c2863359ff451ac0fc':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:14:48 +0000 (10:14 -0700)]

am 001e8e53: (-s ours) am 38e2dbb5: am b560cfb3: am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '001e8e53ef98a9c836baf90f99db0dc1435b14f8':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:14:45 +0000 (10:14 -0700)]

am 5a9d8365: (-s ours) am 39e670af: am be7a814e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '5a9d8365ecd44c8665eae36acea3b2792458ef8b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 17:14:41 +0000 (10:14 -0700)]

am b7fa93ec: am 8b01b864: am 264df9b3: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit 'b7fa93ec6e35a3f89a5645965bf57d613aefb907':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:14:37 +0000 (10:14 -0700)]

am 0bf59479: (-s ours) am 8904f8fa: (-s ours) am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '0bf59479b4e34ebfd03b168927575cfefa3275b8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:14:34 +0000 (10:14 -0700)]

am e83ee05c: (-s ours) am 5ec9e005: (-s ours) am f7d69a95: am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'e83ee05caaed4d2dd4b0fb27ee2d09d162daab76':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 17:14:30 +0000 (10:14 -0700)]

am 97829d03: am e262eb2f: am 3e31a0dc: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '97829d03ec189efde76b44a7246d9f1d02d3bcd2':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 17:14:26 +0000 (10:14 -0700)]

am 3a094db0: am 9674037b: am c3921fd0: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit '3a094db03e3d982d32e238ec00d4bd14d3c596d6':

commit | commitdiff | tree

Irfan Sheriff [Tue, 30 Oct 2012 17:14:22 +0000 (10:14 -0700)]

am d3a79856: am 1863f554: am 5193efba: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit 'd3a79856d89d49629c0de34c0e57b7514934ccc8':

commit | commitdiff | tree

Jim Miller [Tue, 30 Oct 2012 17:14:14 +0000 (10:14 -0700)]

am ced46451: am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec

* commit 'ced46451736d11d558c1771270dc56f886e2c377':
Update status area and emergency call logic to match new spec

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 17:14:08 +0000 (10:14 -0700)]

am b829b57f: am c5c0028c: am e3643138: Implementing new slider / widget interaction where frame goes around the widget

* commit 'b829b57f7401f5565b017755660fd6f1e4978815':
Implementing new slider / widget interaction where frame goes around the widget

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:14:03 +0000 (10:14 -0700)]

am 967fa0e3: (-s ours) am 83c7422f: am b317db4c: am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '967fa0e3b6328a533b550db121e3f556c3c8171e':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:13:55 +0000 (10:13 -0700)]

am 461c3157: (-s ours) am 45625ca1: am e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '461c3157ef65c7d4aed5160d3a18aa5f19f63ded':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:13:51 +0000 (10:13 -0700)]

am 359ae5fc: (-s ours) am 6bc36ee9: am 5c33a55f: am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '359ae5fc7a67599e7263d3b07c57f5de970f149b':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:13:47 +0000 (10:13 -0700)]

am b7f97ef3: (-s ours) am 4e78295a: am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'b7f97ef3fefc0e73f3e0d34df8939c519a8cb638':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 17:13:43 +0000 (10:13 -0700)]

am 513119e8: am b78af430: am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '513119e8b87142066898189f016cded2e1949b08':

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Oct 2012 17:13:39 +0000 (10:13 -0700)]

am ba621aa9: am f322c943: am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting.

* commit 'ba621aa963e8663c0848fd0434bdfb33af24e876':

commit | commitdiff | tree

John Spurlock [Tue, 30 Oct 2012 17:13:35 +0000 (10:13 -0700)]

am bb7faa1f: am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev

* commit 'bb7faa1f450b9664207047b01fd040ee23d77414':
Use settings to persist sticky widget.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 17:13:31 +0000 (10:13 -0700)]

am ee12c306: am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev

* commit 'ee12c3063dd5760ab2c6d7cf979bc3d9f986ba5e':
Improved handle touch interaction.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 17:13:27 +0000 (10:13 -0700)]

am c55eba7f: am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev

* commit 'c55eba7f97cf1ffd133e1897826d4d4d328606e6':
Bigger lock icon.

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 17:13:23 +0000 (10:13 -0700)]

am 10f082c6: am 9633ea97: am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed

* commit '10f082c6cac6e192a42c20d596d2c383a6ee930f':
Ensuring layers are enabled on screen on and that pages are correctly transformed

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 17:13:18 +0000 (10:13 -0700)]

am c19401a7: am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit 'c19401a793869e9569b72f2c4c3fae9db9254c44':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 17:13:14 +0000 (10:13 -0700)]

am 4092a505: am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '4092a505f849abedac9537beeaa46ba8b3c8377b':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 17:13:10 +0000 (10:13 -0700)]

am b04d5c94: am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit 'b04d5c94e704708de90627b714f2d51ffc26d613':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 17:13:06 +0000 (10:13 -0700)]

am 4f98fbe9: am 83372881: am fdbbbba4: Updated add-widget graphics

* commit '4f98fbe9a919a667dfd2607daefc7f87e7f70fab':
Updated add-widget graphics

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 17:11:57 +0000 (10:11 -0700)]

am 60b6ae23: am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit '60b6ae23f6a1ef41ea7976c7f6b70b26f13f96b6':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Mathias Agopian [Tue, 30 Oct 2012 17:11:23 +0000 (10:11 -0700)]

am ecd580d7: am fdd714f8: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev

* commit 'ecd580d7dabfce40690a0e820087e169e7c30865':
fix an overflow in the orientation sensonr calculations

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 17:11:01 +0000 (10:11 -0700)]

am 88ae0ae4: am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '88ae0ae4848ce894612397957cf4de6a6a50a394':
audio service: make dock audio is off by default

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 30 Oct 2012 17:10:57 +0000 (10:10 -0700)]

am 15f7136e: am 0c419856: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev

* commit '15f7136e9b0b4ce1e512be7863b2e61e47d855f3':
No playback and music widget from other user on user switch

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:47 +0000 (10:10 -0700)]

am 12b975d4: (-s ours) am c80f671a: am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '12b975d47bb879d37c42453306408f7548668de3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:40 +0000 (10:10 -0700)]

am ded08eb1: (-s ours) am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'ded08eb19dd048ba46a6cb731391362300796d75':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 17:10:29 +0000 (10:10 -0700)]

am 91b231e0: am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit '91b231e0d63f1de6c93f9d54b34445c4356d360d':
Fix for some downloaded apps showing up on all users

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:23 +0000 (10:10 -0700)]

am f5a8e204: (-s ours) am 34a1e0dd: (-s ours) am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f5a8e204dbbf83a8c716977fe0855037862a1414':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:18 +0000 (10:10 -0700)]

am 681c588a: (-s ours) am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '681c588aee58bf702bfa2aa48a59bde2a64ee5ad':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 16:23:54 +0000 (09:23 -0700)]

am 7066b888: am c864d952: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '7066b888c229d4ebe5fde99b2f2201a6064a5015':

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 30 Oct 2012 16:23:50 +0000 (09:23 -0700)]

am 805345b2: am f1c62be6: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev

* commit '805345b2b68520eb9a6d4d6678baab20162c92a7':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:23:47 +0000 (09:23 -0700)]

am 38e2dbb5: am b560cfb3: am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '38e2dbb51beb7813574ba3fa8b6b839401eb954e':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:23:43 +0000 (09:23 -0700)]

am 39e670af: am be7a814e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '39e670af31d2a05a4fdb853b6e99f5378ddb4b7a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 16:23:40 +0000 (09:23 -0700)]

am 8b01b864: am 264df9b3: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit '8b01b864106391905f87196bd9f541e2d6f41d66':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:23:39 +0000 (09:23 -0700)]

am 8904f8fa: (-s ours) am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '8904f8faf046cf1f0fd6e88fcf4836f10ece6e47':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:20:49 +0000 (09:20 -0700)]

am 5ec9e005: (-s ours) am f7d69a95: am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5ec9e005dc1de25dea1184604e24287238a16ae8':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 16:17:56 +0000 (09:17 -0700)]

am e262eb2f: am 3e31a0dc: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit 'e262eb2f39729343b7ef87af13190348be74994a':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 16:17:52 +0000 (09:17 -0700)]

am 9674037b: am c3921fd0: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit '9674037b682a65770fe9f47dc68689a2f4fe0453':

commit | commitdiff | tree

Irfan Sheriff [Tue, 30 Oct 2012 16:17:49 +0000 (09:17 -0700)]

am 1863f554: am 5193efba: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit '1863f554dd85aae0a427db305e2803513b120106':

commit | commitdiff | tree

Jim Miller [Tue, 30 Oct 2012 16:17:45 +0000 (09:17 -0700)]

am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec

* commit 'f4642bc84b7d7d39d0455498b1944e492185c8d4':
Update status area and emergency call logic to match new spec

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 16:17:41 +0000 (09:17 -0700)]

am c5c0028c: am e3643138: Implementing new slider / widget interaction where frame goes around the widget

* commit 'c5c0028c6dad676e0c5ba6527aa5a3ce4b459fed':
Implementing new slider / widget interaction where frame goes around the widget

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:17:38 +0000 (09:17 -0700)]

am 83c7422f: am b317db4c: am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '83c7422fc03714a1fb311438208f8c1837af42e7':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:17:35 +0000 (09:17 -0700)]

am 45625ca1: am e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '45625ca1d4dd62f4bd4da89a7774c99bb2e28957':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:56 +0000 (09:14 -0700)]

am 6bc36ee9: am 5c33a55f: am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6bc36ee95f2b4ef6e76cbabb0391dd57473be53b':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:52 +0000 (09:14 -0700)]

am 4e78295a: am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '4e78295ac871a2d3d35b07f18c83868976705097':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 16:14:23 +0000 (09:14 -0700)]

am c864d952: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit 'c864d952bcb0f229b98254667f273e7a91da5d45':

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 30 Oct 2012 16:14:19 +0000 (09:14 -0700)]

am f1c62be6: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev

* commit 'f1c62be6b4f1d631666deedd4ef02981ed7536f9':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:15 +0000 (09:14 -0700)]

am b560cfb3: am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'b560cfb3b6595939d1cf7bf9ce9ce5d352254993':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:12 +0000 (09:14 -0700)]

am be7a814e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'be7a814e0ec2b419f45abbab520f529aafdc5c65':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 16:14:07 +0000 (09:14 -0700)]

am 264df9b3: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

* commit '264df9b3db93699bc3fab87af6fac3883d31a600':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:04 +0000 (09:14 -0700)]

am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '3cbc6cd87dc854a294c6960cda01bca02ca0af7f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:14:00 +0000 (09:14 -0700)]

am f7d69a95: am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f7d69a9558f29920fa8db30e08b467a8f185ef1f':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 16:13:56 +0000 (09:13 -0700)]

am 3e31a0dc: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '3e31a0dc91600034b32cdb53e72bbb96ddc75317':

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 16:13:53 +0000 (09:13 -0700)]

am c3921fd0: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit 'c3921fd000ef0174c1b3b3f7547519724f116deb':

commit | commitdiff | tree

Irfan Sheriff [Tue, 30 Oct 2012 16:13:49 +0000 (09:13 -0700)]

am 5193efba: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit '5193efba34071527234f155ffb8cfe8850b14e00':

commit | commitdiff | tree

Jim Miller [Tue, 30 Oct 2012 16:13:46 +0000 (09:13 -0700)]

am 0b728244: Update status area and emergency call logic to match new spec

* commit '0b728244dc87b4a453f2191c2cb37a86e91aee0a':
Update status area and emergency call logic to match new spec

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 16:13:42 +0000 (09:13 -0700)]

am e3643138: Implementing new slider / widget interaction where frame goes around the widget

* commit 'e3643138c89d49a01ba6a622ffaf71c9a95d5cdc':
Implementing new slider / widget interaction where frame goes around the widget

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:13:38 +0000 (09:13 -0700)]

am b317db4c: am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'b317db4c5c32ad419a777986bd97a659af1142d2':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:13:33 +0000 (09:13 -0700)]

am e5e45b18: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'e5e45b18319cce8c551ba655e9a7e9ffd41d052e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:11:32 +0000 (09:11 -0700)]

am 5c33a55f: am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5c33a55fc4bb7c24777c14fd030ebc121aedfce3':

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 16:11:31 +0000 (09:11 -0700)]

am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'ff45c88de22a604d4519a1978a76481f31ffd2dc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 15:53:24 +0000 (08:53 -0700)]

am b78af430: am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit 'b78af430f03c40875e1ee0d1317f2e9537339c15':

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Oct 2012 15:53:21 +0000 (08:53 -0700)]

am f322c943: am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting.

* commit 'f322c94333d9fdebc13d866fa4fefd6f6ce28faa':

commit | commitdiff | tree

John Spurlock [Tue, 30 Oct 2012 15:53:17 +0000 (08:53 -0700)]

am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev

* commit '0cb115f6bcfbff970cd66d89c9db951b4735c801':
Use settings to persist sticky widget.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:53:13 +0000 (08:53 -0700)]

am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev

* commit '0f527aa5f64ba43eb75a00baa162191b6bc8a076':
Improved handle touch interaction.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:53:10 +0000 (08:53 -0700)]

am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev

* commit 'a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
Bigger lock icon.

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:53:06 +0000 (08:53 -0700)]

am 9633ea97: am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed

* commit '9633ea97c2558d7cb346cc227d3b1d479a176f1a':
Ensuring layers are enabled on screen on and that pages are correctly transformed

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:53:02 +0000 (08:53 -0700)]

am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit '7fb0021d18a6491fdc816027081bff8c8d65f5aa':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 15:52:59 +0000 (08:52 -0700)]

am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit 'f68f41b474ed35875a771ec71fb86887b629c58c':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 15:52:55 +0000 (08:52 -0700)]

am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:52:52 +0000 (08:52 -0700)]

am 83372881: am fdbbbba4: Updated add-widget graphics

* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
Updated add-widget graphics

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 15:49:12 +0000 (08:49 -0700)]

am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '4d36d9d80c616d469df662089ebf9f335890acb4':

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Oct 2012 15:49:08 +0000 (08:49 -0700)]

am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting.

* commit '36eba5d0a9bc8a7314349f86d617e300eb6b2fa3':

commit | commitdiff | tree

John Spurlock [Tue, 30 Oct 2012 15:49:05 +0000 (08:49 -0700)]

am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev

* commit 'b2f21c53cf423cad5cf2f5d92579258decb40631':
Use settings to persist sticky widget.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:49:01 +0000 (08:49 -0700)]

am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev

* commit 'bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
Improved handle touch interaction.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:48:57 +0000 (08:48 -0700)]

am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev

* commit 'f002bf19e841301388238ef19552c9dfc24d4d72':
Bigger lock icon.

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:48:52 +0000 (08:48 -0700)]

am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed

* commit '47c6cfaa3799951f999a4d2000cb628080708551':
Ensuring layers are enabled on screen on and that pages are correctly transformed

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:48:48 +0000 (08:48 -0700)]

am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 15:48:44 +0000 (08:48 -0700)]

am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit 'e7cd58bd0323c02ebc51e48db11fe926ac4b9f9c':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 15:48:38 +0000 (08:48 -0700)]

am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:48:35 +0000 (08:48 -0700)]

am fdbbbba4: Updated add-widget graphics

* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
Updated add-widget graphics

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:21:28 +0000 (17:21 -0700)]

am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'b33588e1353076398b081a2ec4c79a04305e256e':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:18:04 +0000 (17:18 -0700)]

am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:15:27 +0000 (17:15 -0700)]

am b4fd7cfe: am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit 'b4fd7cfe69f50c3bf611c1d790c963109baf14df':
FusedLocation runs per user as user

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:15:23 +0000 (17:15 -0700)]

am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev

* commit '9348d76098c941ecaf8b114dc98933e511e3f556':
Revert "make FLP play nicely with multiuser"

commit | commitdiff | tree

Irfan Sheriff [Tue, 30 Oct 2012 00:15:19 +0000 (17:15 -0700)]

am ec82f20d: am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit 'ec82f20d7a0e085cdadf63eddd6b2fa472867adb':
Fix handling escaped chars in ssid

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 00:15:15 +0000 (17:15 -0700)]

am da64dc7a: (-s ours) am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'da64dc7a619a0f8c7c7d2ef29c97788922926345':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 00:15:11 +0000 (17:15 -0700)]

am bb242a7d: (-s ours) am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'bb242a7dd978460e34440f2b7b53d1a2051d7ae2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 00:15:07 +0000 (17:15 -0700)]

am 76bce54b: am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '76bce54bc8c2cbe213c5aa914f45af9ac9022744':
Don't scale screen brightness by electron beam level.

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Oct 2012 00:15:03 +0000 (17:15 -0700)]

am 308aae45: am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting.

* commit '308aae45dc53b259e603c3436df63d67ce04dd4b':
Doc change: fix some table formatting.

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 00:14:59 +0000 (17:14 -0700)]

am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
add settings for dock audio enabled

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 30 Oct 2012 00:14:54 +0000 (17:14 -0700)]

am d31f0ab9: am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev

* commit 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:14:50 +0000 (17:14 -0700)]

Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:14:50 +0000 (17:14 -0700)]

am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev

* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
make FLP play nicely with multiuser