OSDN Git Service
Amith Yamasani [Thu, 1 Nov 2012 15:44:46 +0000 (08:44 -0700)]
am
f9a2f324: Merge "Changed the way that date format selector is shown."
* commit '
f9a2f324d70cdbb4b0786f868ae01f99fe2734fb':
Changed the way that date format selector is shown.
Amith Yamasani [Thu, 1 Nov 2012 15:19:32 +0000 (08:19 -0700)]
Merge "Changed the way that date format selector is shown."
The Android Open Source Project [Thu, 1 Nov 2012 14:52:39 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d
Michael Jurka [Thu, 1 Nov 2012 02:39:40 +0000 (19:39 -0700)]
am
6df9ce11: am
0b2bd8d1: New widget picker for keyguard widgets
* commit '
6df9ce11ca25ed0013c58dae34ac874322bd09fa':
New widget picker for keyguard widgets
Eric Laurent [Thu, 1 Nov 2012 02:39:39 +0000 (19:39 -0700)]
am
a6843064: am
523d9dc4: am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
a6843064be384ab46439cf236a9aa64b94e9acc6':
Justin Ho [Thu, 1 Nov 2012 02:39:38 +0000 (19:39 -0700)]
am
a724bb1f: am
5da02a47: am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
a724bb1facb2f2ccc44a21ff997cc5dbd90cc940':
Jeff Sharkey [Thu, 1 Nov 2012 02:39:37 +0000 (19:39 -0700)]
am
2eec33fe: am
58e97bf4: am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
2eec33fed79f0f902acc9afbf4433f00dbb6d2ce':
Baligh Uddin [Thu, 1 Nov 2012 02:39:36 +0000 (19:39 -0700)]
am
a4197d13: am
d1d9e350: am
2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a4197d13b9ca7325b604564c784abc7dccf5fa01':
Baligh Uddin [Thu, 1 Nov 2012 02:39:35 +0000 (19:39 -0700)]
am
723498fd: am
eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
723498fd4a8366495003684b50b9bbced4fa26cd':
Import translations. DO NOT MERGE
Vikram Aggarwal [Thu, 1 Nov 2012 02:39:33 +0000 (19:39 -0700)]
am
a27e1cb2: am
ee284023: am
8d028a87: Allow wireless charging during encrypt
* commit '
a27e1cb204e2d61588ea4004790f02f7ced4bd0e':
Baligh Uddin [Thu, 1 Nov 2012 02:39:31 +0000 (19:39 -0700)]
am
a10a75ca: am
910fe047: am
e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit '
a10a75ca16eda40ce6ae171b56e2fddafb13331d':
Baligh Uddin [Thu, 1 Nov 2012 02:39:30 +0000 (19:39 -0700)]
am
f706edfb: am
9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit '
f706edfbd4756173ce802aec53ce14ee730b87dd':
Import translations. DO NOT MERGE
Michael Jurka [Thu, 1 Nov 2012 01:36:03 +0000 (18:36 -0700)]
am
0b2bd8d1: New widget picker for keyguard widgets
* commit '
0b2bd8d11d6947a6ce71db0691ba341aec7a2964':
New widget picker for keyguard widgets
Eric Laurent [Thu, 1 Nov 2012 01:36:02 +0000 (18:36 -0700)]
am
523d9dc4: am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
523d9dc460d3af22372860f4d3f83a4529257545':
Justin Ho [Thu, 1 Nov 2012 01:36:00 +0000 (18:36 -0700)]
am
5da02a47: am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
5da02a476944c6ca3672cf00265f7f163028a8c5':
Jeff Sharkey [Thu, 1 Nov 2012 01:35:59 +0000 (18:35 -0700)]
am
58e97bf4: am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
58e97bf41f1ee38d401146553d3de8678b437b8b':
Baligh Uddin [Thu, 1 Nov 2012 01:35:57 +0000 (18:35 -0700)]
am
d1d9e350: am
2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d1d9e350452e1147f9a0c5b312f869f652fb9722':
Baligh Uddin [Thu, 1 Nov 2012 01:35:56 +0000 (18:35 -0700)]
am
eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
eb70ca293a2edbba128a74bb268089f4a59e1c75':
Import translations. DO NOT MERGE
Vikram Aggarwal [Thu, 1 Nov 2012 01:35:54 +0000 (18:35 -0700)]
am
ee284023: am
8d028a87: Allow wireless charging during encrypt
* commit '
ee2840231ce60fcc7ae2f0fa045ffa94a2877c90':
Baligh Uddin [Thu, 1 Nov 2012 01:35:48 +0000 (18:35 -0700)]
am
910fe047: am
e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit '
910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9':
Baligh Uddin [Thu, 1 Nov 2012 01:35:31 +0000 (18:35 -0700)]
am
9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit '
9ad78e880f98fdf53cb40bcdcf0f9af3ea795bc6':
Import translations. DO NOT MERGE
The Android Automerger [Thu, 1 Nov 2012 01:34:23 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Tue, 30 Oct 2012 22:32:27 +0000 (15:32 -0700)]
New widget picker for keyguard widgets
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work
Also, remove use of features filter from the
picker, since this is being removed from the API
Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
The Android Open Source Project [Wed, 31 Oct 2012 16:18:37 +0000 (09:18 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I40ce39e6f067e352b19562897b2baf2bab3b6a39
The Android Automerger [Wed, 31 Oct 2012 03:12:35 +0000 (20:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 21:15:32 +0000 (14:15 -0700)]
am
d6287242: am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
d6287242c260352baf649515fb5c6f170af5f397':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:14:40 +0000 (14:14 -0700)]
am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
f79daa942005608e56a4a0d7f414fedccd56e467':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:14:14 +0000 (14:14 -0700)]
am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
f79daa942005608e56a4a0d7f414fedccd56e467':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:12:22 +0000 (14:12 -0700)]
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
Justin Ho [Tue, 30 Oct 2012 18:20:28 +0000 (11:20 -0700)]
am
d1c99a3d: am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
d1c99a3d7ec7be0ae5a43e7cb3db96f59d701ac3':
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Justin Ho [Tue, 30 Oct 2012 18:18:26 +0000 (11:18 -0700)]
am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Justin Ho [Tue, 30 Oct 2012 18:17:54 +0000 (11:17 -0700)]
am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Justin Ho [Tue, 30 Oct 2012 18:16:44 +0000 (11:16 -0700)]
Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 00:56:46 +0000 (17:56 -0700)]
display audio dialog when connecting low end dock
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.
Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.
Bug
7302106.
Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
The Android Automerger [Tue, 30 Oct 2012 15:53:03 +0000 (08:53 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Daniel Sandler [Tue, 30 Oct 2012 13:59:16 +0000 (09:59 -0400)]
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
Jeff Sharkey [Mon, 29 Oct 2012 23:38:52 +0000 (16:38 -0700)]
am
ea6f5051: am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
ea6f50515620c4ab5abefeca8431505b05db9672':
Selectively enable bugreport in power menu.
Jeff Sharkey [Mon, 29 Oct 2012 23:37:17 +0000 (16:37 -0700)]
am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
Selectively enable bugreport in power menu.
Jeff Sharkey [Mon, 29 Oct 2012 23:36:38 +0000 (16:36 -0700)]
am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
Selectively enable bugreport in power menu.
Jeff Sharkey [Mon, 29 Oct 2012 23:35:07 +0000 (16:35 -0700)]
Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:28:01 +0000 (15:28 -0700)]
am
5ba8c670: am
2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5ba8c670a95dc54f3d384c91a2719a06c706d4ce':
Import translations. DO NOT MERGE
Vikram Aggarwal [Mon, 29 Oct 2012 22:28:00 +0000 (15:28 -0700)]
am
9ad7e7e3: am
8d028a87: Allow wireless charging during encrypt
* commit '
9ad7e7e3dabc0c0125f1373164857e8782e443dd':
Allow wireless charging during encrypt
Baligh Uddin [Mon, 29 Oct 2012 22:25:25 +0000 (15:25 -0700)]
am
2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
Import translations. DO NOT MERGE
Vikram Aggarwal [Mon, 29 Oct 2012 22:25:19 +0000 (15:25 -0700)]
am
8d028a87: Allow wireless charging during encrypt
* commit '
8d028a87e97f9420f9db31a6b8aa80859fe393b3':
Allow wireless charging during encrypt
Baligh Uddin [Mon, 29 Oct 2012 22:22:57 +0000 (15:22 -0700)]
am
8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
8ae40a07a4b8d9c9ccd73a6eba5ac62be3b8b5ef':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:22:47 +0000 (15:22 -0700)]
am
2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:20:29 +0000 (15:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 22:19:59 +0000 (15:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:19:34 +0000 (15:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Vikram Aggarwal [Mon, 29 Oct 2012 22:14:23 +0000 (15:14 -0700)]
am
8d028a87: Allow wireless charging during encrypt
* commit '
8d028a87e97f9420f9db31a6b8aa80859fe393b3':
Allow wireless charging during encrypt
Jeff Sharkey [Mon, 29 Oct 2012 20:59:07 +0000 (13:59 -0700)]
Selectively enable bugreport in power menu.
The underlying bugreport init service depends on USB debugging being
turned on for user builds. This change makes the developer options
UI reflect this constraint.
Bug:
7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
Baligh Uddin [Mon, 29 Oct 2012 21:31:31 +0000 (14:31 -0700)]
am
dd165551: am
e42e7b85: Import translations. DO NOT MERGE
* commit '
dd16555147ec31734b755312d954342d02621587':
Import translations. DO NOT MERGE
Eric Laurent [Mon, 29 Oct 2012 21:31:30 +0000 (14:31 -0700)]
am
65b9944f: am
79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
* commit '
65b9944f5c330f0d623a7fb059566eda942c7045':
added dock audio settings for non bluetooth docks
Baligh Uddin [Mon, 29 Oct 2012 21:12:10 +0000 (14:12 -0700)]
am
e42e7b85: Import translations. DO NOT MERGE
* commit '
e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
Eric Laurent [Mon, 29 Oct 2012 21:02:27 +0000 (14:02 -0700)]
am
79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
* commit '
79b7fdd2c0682f59f3a0899041b470cc02154219':
added dock audio settings for non bluetooth docks
Daniel Sandler [Mon, 29 Oct 2012 20:52:06 +0000 (13:52 -0700)]
am
586ba830: am
381df27c: am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
586ba830bc4fe4b8617564dac3afb71d78bdb713':
Michael Jurka [Mon, 29 Oct 2012 20:52:04 +0000 (13:52 -0700)]
am
87e7c274: am
8a4024ec: Add ability to add clock widget to keyguard
* commit '
87e7c274f26b078ddc7bcab783cecbcc0251c86b':
Add ability to add clock widget to keyguard
Amith Yamasani [Mon, 29 Oct 2012 20:52:03 +0000 (13:52 -0700)]
am
a1e3586a: am
67920f06: am
b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit '
a1e3586a96de17f2a23b5e7bb9e7fff65d6ded3b':
Michael Jurka [Mon, 29 Oct 2012 20:51:59 +0000 (13:51 -0700)]
am
6576e1a7: am
d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
* commit '
6576e1a778c38039d7a4609f72fe892b8f70e2c7':
Adding ability to add multiple keyguard widgets
Baligh Uddin [Mon, 29 Oct 2012 20:51:57 +0000 (13:51 -0700)]
am
38ff9890: am
ed49b6fc: am
b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
38ff9890ba9b165657562534d402a454d1d0efd3':
Baligh Uddin [Mon, 29 Oct 2012 20:51:55 +0000 (13:51 -0700)]
am
0c31e078: am
e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
0c31e078d6a8337e002b084769caa94c199fe10f':
Import translations. DO NOT MERGE
Amith Yamasani [Mon, 29 Oct 2012 20:42:04 +0000 (13:42 -0700)]
am
b14659eb: am
c250ae9d: am
5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '
b14659eb1ad147e1b0046df1a23042df681ddcbc':
Baligh Uddin [Mon, 29 Oct 2012 20:42:02 +0000 (13:42 -0700)]
am
434b9c4f: am
06545e87: am
e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '
434b9c4ff7c32fd69974ba77be1bc3eb210464a1':
Daniel Sandler [Mon, 29 Oct 2012 20:42:01 +0000 (13:42 -0700)]
am
381df27c: am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
381df27cd69c9c7315556c1dc40403118f7c585a':
Baligh Uddin [Mon, 29 Oct 2012 20:42:01 +0000 (13:42 -0700)]
am
f6932aeb: am
a7489954: am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
f6932aebd428a35f2973d2ddda2459c179021b9f':
Russell Brenner [Mon, 29 Oct 2012 20:42:00 +0000 (13:42 -0700)]
am
c0b22b0a: am
98f884b1: am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
c0b22b0a3590338e1203912822d84dfdc8730706':
Michael Jurka [Mon, 29 Oct 2012 20:41:59 +0000 (13:41 -0700)]
am
8a4024ec: Add ability to add clock widget to keyguard
* commit '
8a4024ecac34515947b185c153e1055549713b38':
Add ability to add clock widget to keyguard
Daniel Sandler [Mon, 29 Oct 2012 20:41:59 +0000 (13:41 -0700)]
am
96fcd6bb: am
25608dd1: am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
96fcd6bb3d07eeccd4a1105cfa9a2e32ddb523ca':
Amith Yamasani [Mon, 29 Oct 2012 20:41:58 +0000 (13:41 -0700)]
am
67920f06: am
b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit '
67920f0639681cb5e5bc193688e4fc1c7419c872':
Amith Yamasani [Mon, 29 Oct 2012 20:41:58 +0000 (13:41 -0700)]
am
d379946b: am
7ff9d5e1: am
b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '
d379946bca8dd7cf91707698aa15f2a8b5514d03':
Baligh Uddin [Mon, 29 Oct 2012 20:41:57 +0000 (13:41 -0700)]
am
27c1348b: am
5fb549bf: am
a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
27c1348b43125cf31e84ed93987989c6d37d5cb7':
Baligh Uddin [Mon, 29 Oct 2012 20:41:56 +0000 (13:41 -0700)]
am
aee2ef0a: am
350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
aee2ef0a848d8008eda92a0f1fbdcb65af0490ce':
Import translations. DO NOT MERGE
Michael Jurka [Mon, 29 Oct 2012 20:41:52 +0000 (13:41 -0700)]
am
d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
* commit '
d4362b7d356f1f33e1752be68c149b1cd95d8463':
Adding ability to add multiple keyguard widgets
Baligh Uddin [Mon, 29 Oct 2012 20:41:40 +0000 (13:41 -0700)]
am
ed49b6fc: am
b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ed49b6fc39eeeae00218924e47a206720e365501':
Baligh Uddin [Mon, 29 Oct 2012 20:41:29 +0000 (13:41 -0700)]
am
e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
e00f034ec7badd18a7c4d3a36ed6bb6a0ab7438a':
Import translations. DO NOT MERGE
Guang Zhu [Mon, 29 Oct 2012 20:39:42 +0000 (13:39 -0700)]
am
bb15cfbd: am
09a728a2: am
a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit '
bb15cfbd112e729372e8b1a424d56cbdb34d5db5':
Russell Brenner [Mon, 29 Oct 2012 20:39:41 +0000 (13:39 -0700)]
am
1a15dcb1: am
3fd05c88: am
56a166e9: Added info about why Wi-Fi is required
* commit '
1a15dcb1a2ae6116112e92a5638c30c1629c6729':
John Spurlock [Mon, 29 Oct 2012 20:39:40 +0000 (13:39 -0700)]
am
7c9b067b: am
5586afe0: am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
7c9b067bb165824dcc3917d11dc95a891374e6a8':
Jeff Sharkey [Mon, 29 Oct 2012 20:39:39 +0000 (13:39 -0700)]
am
717ad24a: am
9d0fbd72: am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
717ad24a822c40044992743025e93664281136f4':
Romain Guy [Mon, 29 Oct 2012 20:39:38 +0000 (13:39 -0700)]
am
4d92c702: am
7caa7515: am
8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
* commit '
4d92c702b5561ed072a73227c898e41ebac6b44e':
Zhihai Xu [Mon, 29 Oct 2012 20:39:37 +0000 (13:39 -0700)]
am
79cc26f2: am
ac8cfd0b: am
8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
79cc26f24c57c699ca890f5bbf3362c740db4f4f':
Daniel Sandler [Mon, 29 Oct 2012 20:39:35 +0000 (13:39 -0700)]
am
653e5f9b: am
8b6036c3: am
deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '
653e5f9bc83148ba5452edb29fc576bac93fb89b':
Fabrice Di Meglio [Mon, 29 Oct 2012 20:39:33 +0000 (13:39 -0700)]
am
c5f7937e: am
17edbf38: am
c14d1134: Merge "Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
* commit '
c5f7937e064ee7c125c2f91c5b3a934b7b15d4d3':
Baligh Uddin [Mon, 29 Oct 2012 20:39:32 +0000 (13:39 -0700)]
am
c2e65ef3: am
67a54eaa: (-s ours) am
f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c2e65ef38e3946625465477e88cb5a59d36e1618':
Amith Yamasani [Mon, 29 Oct 2012 20:39:30 +0000 (13:39 -0700)]
am
c250ae9d: am
5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '
c250ae9d712d7ba4b771ea8414876b9007a8da24':
Brian Muramatsu [Mon, 29 Oct 2012 20:39:30 +0000 (13:39 -0700)]
am
e447debb: am
0bfd02b0: am
c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit '
e447debbd8f071a01d32d782aac2e02140c32572':
Baligh Uddin [Mon, 29 Oct 2012 20:39:29 +0000 (13:39 -0700)]
am
06545e87: am
e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '
06545e87b5db25abcdb5790c082fca894db9d664':
John Huang [Mon, 29 Oct 2012 20:39:29 +0000 (13:39 -0700)]
am
2a43340d: am
ff11f09a: am
50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
* commit '
2a43340ddb42ee3913235fcb9ddfd7ea33b6c085':
Baligh Uddin [Mon, 29 Oct 2012 20:39:28 +0000 (13:39 -0700)]
am
a7489954: am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
a7489954019f0d451e0f63b8c39a6e06a9f83002':
Casey Burkhardt [Mon, 29 Oct 2012 20:39:28 +0000 (13:39 -0700)]
am
af8b915f: am
7367bb2a: am
91ecf27a: Correcting content description in Wifi network selection activity. Bug:
7362208
* commit '
af8b915f9c49b50aa02e41d3849ed0668b833328':
Zhihai Xu [Mon, 29 Oct 2012 20:39:27 +0000 (13:39 -0700)]
am
b1571ad6: am
57569b40: am
6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
b1571ad6866184c0048f60ea05e235856a1464b1':
Russell Brenner [Mon, 29 Oct 2012 20:39:26 +0000 (13:39 -0700)]
am
98f884b1: am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
98f884b19575e65702286820be58959c12f59815':
Daniel Sandler [Mon, 29 Oct 2012 20:39:25 +0000 (13:39 -0700)]
am
25608dd1: am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
Amith Yamasani [Mon, 29 Oct 2012 20:39:25 +0000 (13:39 -0700)]
Amith Yamasani [Mon, 29 Oct 2012 20:39:24 +0000 (13:39 -0700)]
am
7ff9d5e1: am
b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '
7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
Michael Jurka [Mon, 29 Oct 2012 20:39:24 +0000 (13:39 -0700)]
am
ed3e89ab: am
eabe82d0: am
7d078f94: Fix crash when viewing installed app details page
* commit '
ed3e89abe50425f50bce2880bff86a6e38772f10':
Baligh Uddin [Mon, 29 Oct 2012 20:39:23 +0000 (13:39 -0700)]
am
5fb549bf: am
a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5fb549bf5f21cb240b4af35779e291d5d48f0109':
Baligh Uddin [Mon, 29 Oct 2012 20:39:23 +0000 (13:39 -0700)]
am
391dc9f7: am
3441d4ac: (-s ours) am
8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
391dc9f798a0b0314c0355a6347d38b8e2e8972e':
Baligh Uddin [Mon, 29 Oct 2012 20:39:21 +0000 (13:39 -0700)]
am
350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
350ea07ca8e650bf167491deefdb421a183bbedd':
Import translations. DO NOT MERGE
Guang Zhu [Mon, 29 Oct 2012 20:36:43 +0000 (13:36 -0700)]
am
09a728a2: am
a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit '
09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
OSDN Git Service
