OSDN Git Service
Winson Chung [Tue, 30 Oct 2012 16:24:08 +0000 (09:24 -0700)]
am
49d42b93: am
7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
* commit '
49d42b9318bac9ee3f5f4f431f32a76bf6c4d65b':
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
Kenny Root [Tue, 30 Oct 2012 16:24:04 +0000 (09:24 -0700)]
am
b769ff3b: am
750d5e11: am
ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit '
b769ff3b4f08e875e1f23487e8a281a8dfe46011':
Mathias Agopian [Tue, 30 Oct 2012 16:24:01 +0000 (09:24 -0700)]
am
49d9a615: am
e4335ada: am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
49d9a615fbcad01ddb6752f9c065302a9c715cb7':
John Spurlock [Tue, 30 Oct 2012 16:23:57 +0000 (09:23 -0700)]
am
c6b4cfa7: am
d9910249: Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
* commit '
c6b4cfa765c20a9169d39d810b72ab967daa1f86':
"Implement grace period for camera widget." -> frame/base
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':
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':
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':
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
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':
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
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':
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':
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':
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':
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
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
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':
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
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':
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
Winson Chung [Tue, 30 Oct 2012 16:14:38 +0000 (09:14 -0700)]
am
7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
* commit '
7bf93cf50fc028a50433741b4e1f1ee8b80f74f0':
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
Kenny Root [Tue, 30 Oct 2012 16:14:34 +0000 (09:14 -0700)]
am
750d5e11: am
ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit '
750d5e11dffa89f90a71aa55244d069ebd8e39d0':
Mathias Agopian [Tue, 30 Oct 2012 16:14:30 +0000 (09:14 -0700)]
am
e4335ada: am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
e4335adad2c726c6ac49927ae71cecfc8089c3f3':
John Spurlock [Tue, 30 Oct 2012 16:14:26 +0000 (09:14 -0700)]
am
d9910249: Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
* commit '
d9910249a4127c351f23d46623df645750d3d21e':
"Implement grace period for camera widget." -> frame/base
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':
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':
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':
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
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':
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
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':
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':
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':
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':
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
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
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':
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
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':
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
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':
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':
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.
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.
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.
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
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
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':
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
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
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':
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':
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.
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.
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.
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
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
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':
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
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
Winson Chung [Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)]
Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
Winson Chung [Tue, 30 Oct 2012 00:43:18 +0000 (17:43 -0700)]
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
- Fixing issue where you can long press a widget to reorder while the challenge is up
Change-Id: I6ef2fa050a5ebc35d1c3e373bb27519580ebe03d
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
Kenny Root [Tue, 30 Oct 2012 00:18:30 +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
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
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
Mathias Agopian [Mon, 29 Oct 2012 23:55:40 +0000 (16:55 -0700)]
am
fdd714f8: am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
fdd714f8d52a7ab2b96839b7cfe8ed917417383b':
fix an overflow in the orientation sensonr calculations
Mathias Agopian [Mon, 29 Oct 2012 23:53:19 +0000 (16:53 -0700)]
am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
fix an overflow in the orientation sensonr calculations
Mathias Agopian [Mon, 29 Oct 2012 23:52:41 +0000 (16:52 -0700)]
am
0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '
0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
fix an overflow in the orientation sensonr calculations
Mathias Agopian [Mon, 29 Oct 2012 23:49:48 +0000 (16:49 -0700)]
Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
John Spurlock [Mon, 29 Oct 2012 23:30:00 +0000 (16:30 -0700)]
Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
Mathias Agopian [Mon, 29 Oct 2012 23:03:46 +0000 (16:03 -0700)]
fix an overflow in the orientation sensonr calculations
this would cause the TYPE_ORIENTATION sensor to report NaN after
40 to 800 hours of up-time. this problem only affects the older
and deprecated SensorListener API.
Bug:
7434842
Change-Id: Ie8593cca9c98e4907e417db4106c06151e3ee9a1
John Spurlock [Sun, 28 Oct 2012 16:34:11 +0000 (12:34 -0400)]
"Implement grace period for camera widget." -> frame/base
Change-Id: If3159fa43d9de6188b262f3db76575c6436e138a
Eric Laurent [Mon, 29 Oct 2012 22:28:08 +0000 (15:28 -0700)]
am
40d076e6: am
61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '
40d076e61748ba304f754501ddaad63a0255bf96':
audio service: make dock audio is off by default
Jean-Michel Trivi [Mon, 29 Oct 2012 22:28:04 +0000 (15:28 -0700)]
am
0c419856: am
643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '
0c41985698f87ef15eb9b84f7727cc937307420b':
No playback and music widget from other user on user switch
Eric Laurent [Mon, 29 Oct 2012 22:25:29 +0000 (15:25 -0700)]
am
61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '
61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
audio service: make dock audio is off by default
Jean-Michel Trivi [Mon, 29 Oct 2012 22:25:24 +0000 (15:25 -0700)]
am
643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '
643e33725866f76402ae147f5b585f7dafdc6d17':
No playback and music widget from other user on user switch
Eric Laurent [Mon, 29 Oct 2012 22:24:14 +0000 (15:24 -0700)]
am
61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '
61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
audio service: make dock audio is off by default
Baligh Uddin [Mon, 29 Oct 2012 22:22:54 +0000 (15:22 -0700)]
am
c80f671a: am
c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c80f671a02c204947b0df569a17f8b2258383454':
Import translations. DO NOT MERGE
Eric Laurent [Mon, 29 Oct 2012 22:21:33 +0000 (15:21 -0700)]
Merge "audio service: make dock audio is off by default" into jb-mr1-dev
Jean-Michel Trivi [Mon, 29 Oct 2012 22:19:59 +0000 (15:19 -0700)]
am
643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '
643e33725866f76402ae147f5b585f7dafdc6d17':
No playback and music widget from other user on user switch
Jean-Michel Trivi [Mon, 29 Oct 2012 22:16:13 +0000 (15:16 -0700)]
Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:12:28 +0000 (15:12 -0700)]
am
c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:12:28 +0000 (15:12 -0700)]
am
c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
c86c4ae693d13f467807cbd8c3aa2025045018c2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:12:25 +0000 (15:12 -0700)]
am
c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:10:57 +0000 (15:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 22:10:09 +0000 (15:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:08:52 +0000 (15:08 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Mon, 29 Oct 2012 22:05:07 +0000 (15:05 -0700)]
am
7fd41276: am
7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
* commit '
7fd412767c063ccd2d80a3db6a0d27cf0ff6d261':
Fix for some downloaded apps showing up on all users
Baligh Uddin [Mon, 29 Oct 2012 22:05:06 +0000 (15:05 -0700)]
am
34a1e0dd: (-s ours) am
f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
34a1e0dda8d6f728e9c324e1e25e3844ec91e4b1':
Import translations. DO NOT MERGE
Amith Yamasani [Mon, 29 Oct 2012 22:02:32 +0000 (15:02 -0700)]
am
7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
* commit '
7c258505ecfbf726c56814963bee798e74ff4cb4':
Fix for some downloaded apps showing up on all users
Amith Yamasani [Mon, 29 Oct 2012 22:02:24 +0000 (15:02 -0700)]
am
7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
* commit '
7c258505ecfbf726c56814963bee798e74ff4cb4':
Fix for some downloaded apps showing up on all users
Amith Yamasani [Mon, 29 Oct 2012 21:57:20 +0000 (14:57 -0700)]
Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:55:21 +0000 (14:55 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 21:54:29 +0000 (14:54 -0700)]
am
f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f64e70fd045c2a786e3d3edf880d806e93beec3b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:54:26 +0000 (14:54 -0700)]
am
f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f64e70fd045c2a786e3d3edf880d806e93beec3b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:51:40 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:50:30 +0000 (14:50 -0700)]
am
4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:47:41 +0000 (14:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Victoria Lease [Mon, 29 Oct 2012 21:31:08 +0000 (14:31 -0700)]
am
629a90cf: am
83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev
* commit '
629a90cf55cd6aa2e326dfdae2142e2b7e156731':
FusedLocation runs per user as user