Commit Graph

9386 Commits

Author SHA1 Message Date
Baligh Uddin
50bfc55e41 am e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
  Import translations. DO NOT MERGE
2012-11-05 14:11:57 -08:00
Jim Miller
fd34f98960 Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev 2012-11-04 18:28:35 -08:00
Baligh Uddin
ba133b8de0 am 3a5acbd3: (-s ours) am 091c12c3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '3a5acbd3fdc5d74b68bdd4e627e916220968e592':
  Import translations. DO NOT MERGE
2012-11-04 17:55:36 -08:00
Baligh Uddin
3a5acbd3fd am 091c12c3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '091c12c398143c6a128f5168f25e789150ffe6d6':
  Import translations. DO NOT MERGE
2012-11-04 17:53:05 -08:00
Baligh Uddin
18facce418 am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
  Import translations. DO NOT MERGE
2012-11-04 17:52:56 -08:00
Baligh Uddin
1057d5e896 Merge "Import translations. DO NOT MERGE" 2012-11-04 17:51:34 -08:00
Baligh Uddin
ecfe5f0d4c Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-04 17:51:15 -08:00
Baligh Uddin
091c12c398 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-04 17:50:59 -08:00
Baligh Uddin
e3a4a5fde5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-04 17:50:45 -08:00
The Android Automerger
2df1470570 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:52 -07:00
Dianne Hackborn
e6b2651e4d am eb6c6935: am b52e8ca6: am 4de4061c: Fix issue #7448596: Can\'t uninstall app that was installed by another user
* commit 'eb6c6935f1b8bf0520ce356ad8b240bec231d8f6':
  Fix issue #7448596: Can't uninstall app that was installed by another user
2012-11-02 15:25:35 -07:00
Dianne Hackborn
eb6c6935f1 am b52e8ca6: am 4de4061c: Fix issue #7448596: Can\'t uninstall app that was installed by another user
* commit 'b52e8ca60d28119ea5936245bd66edcd61c8da5e':
  Fix issue #7448596: Can't uninstall app that was installed by another user
2012-11-02 15:23:25 -07:00
Dianne Hackborn
b52e8ca60d am 4de4061c: Fix issue #7448596: Can\'t uninstall app that was installed by another user
* commit '4de4061c8bb9475cbc5d98f83bf3b2c8ec222407':
  Fix issue #7448596: Can't uninstall app that was installed by another user
2012-11-02 15:20:29 -07:00
Jim Miller
783ea85bec Disable the "none" security selection in settings when there's only 1 user
Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
2012-11-02 13:19:32 -07:00
Baligh Uddin
1d73c4e310 Import translations. DO NOT MERGE
Change-Id: I70b4992b30bc3a3af461536eca0c907e05200481
Auto-generated-cl: translation import
2012-11-02 01:45:20 -07:00
Baligh Uddin
e5860279d8 Import translations. DO NOT MERGE
Change-Id: I4aeb203952a8889425968e0e600f846d0a216c81
Auto-generated-cl: translation import
2012-11-02 01:42:19 -07:00
Baligh Uddin
8b24ac004b Import translations. DO NOT MERGE
Change-Id: I43bce84488cadd7c2c8637e9bac2fdf0d7a1ea58
Auto-generated-cl: translation import
2012-11-02 01:40:39 -07:00
Baligh Uddin
3f5ba40054 Import translations. DO NOT MERGE
Change-Id: I01e080a0c1111417cc502fa4fe126b1431763809
Auto-generated-cl: translation import
2012-11-02 01:38:57 -07:00
Amith Yamasani
357f3dbb24 am 797d6200: am f9a2f324: Merge "Changed the way that date format selector is shown."
* commit '797d620084df296b1d1d3e3c03d519fdf916f2d3':
  Changed the way that date format selector is shown.
2012-11-01 08:46:13 -07:00
Amith Yamasani
797d620084 am f9a2f324: Merge "Changed the way that date format selector is shown."
* commit 'f9a2f324d70cdbb4b0786f868ae01f99fe2734fb':
  Changed the way that date format selector is shown.
2012-11-01 08:44:46 -07:00
Amith Yamasani
f9a2f324d7 Merge "Changed the way that date format selector is shown." 2012-11-01 08:19:32 -07:00
The Android Open Source Project
60e24c4370 am bfb64505: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'bfb645050356fa854da6adbd9091454ad4376c21':
2012-11-01 07:54:41 -07:00
The Android Open Source Project
bfb6450503 Reconcile with jb-mr1-release - do not merge
Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d
2012-11-01 07:52:39 -07:00
Michael Jurka
a24dcee339 am 98dc7952: am 6df9ce11: am 0b2bd8d1: New widget picker for keyguard widgets
* commit '98dc7952f3a6ba4658c70d4ec7574feff34bf73f':
  New widget picker for keyguard widgets
2012-10-31 19:42:16 -07:00
Eric Laurent
ddbbdee89e am 8b1bde87: am a6843064: am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '8b1bde878a4b1cceb7703620f8907173d4962a88':
2012-10-31 19:42:15 -07:00
Justin Ho
ea051f6df4 am 2695f611: am a724bb1f: am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '2695f611a642267ff17fa9b9c66aeb9f531a8ba2':
2012-10-31 19:42:14 -07:00
Jeff Sharkey
73347a354a am 3af51f45: am 2eec33fe: am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '3af51f458fef0da22b4238d7204594e3fbc24d51':
2012-10-31 19:42:13 -07:00
Baligh Uddin
9ef8a46160 am 94308a88: (-s ours) am a4197d13: am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '94308a887707ccec1c0d0e2facafefa12ecf9b92':
2012-10-31 19:42:12 -07:00
Baligh Uddin
f1fc9c6ced am 95989e55: (-s ours) am 723498fd: am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '95989e5526a1bf254fa943d9c67edd8884362aa8':
  Import translations. DO NOT MERGE
2012-10-31 19:42:10 -07:00
Vikram Aggarwal
a1f9db1e9e am 44db0093: am a27e1cb2: am ee284023: am 8d028a87: Allow wireless charging during encrypt
* commit '44db00933f671498a9dd2f9e12a9c1f417da9e2e':
2012-10-31 19:42:09 -07:00
Baligh Uddin
5ef90c2220 am b6413e16: (-s ours) am a10a75ca: am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit 'b6413e166654d2f80aad95a10f8bb639be553985':
2012-10-31 19:42:08 -07:00
Baligh Uddin
e8802479b6 am 5318e5d9: (-s ours) am f706edfb: am 9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit '5318e5d916746f7fe507b4da633ba2a75f9f4f52':
  Import translations. DO NOT MERGE
2012-10-31 19:42:07 -07:00
Michael Jurka
98dc7952f3 am 6df9ce11: am 0b2bd8d1: New widget picker for keyguard widgets
* commit '6df9ce11ca25ed0013c58dae34ac874322bd09fa':
  New widget picker for keyguard widgets
2012-10-31 19:39:40 -07:00
Eric Laurent
8b1bde878a am a6843064: am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit 'a6843064be384ab46439cf236a9aa64b94e9acc6':
2012-10-31 19:39:39 -07:00
Justin Ho
2695f611a6 am a724bb1f: am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit 'a724bb1facb2f2ccc44a21ff997cc5dbd90cc940':
2012-10-31 19:39:38 -07:00
Jeff Sharkey
3af51f458f am 2eec33fe: am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '2eec33fed79f0f902acc9afbf4433f00dbb6d2ce':
2012-10-31 19:39:37 -07:00
Baligh Uddin
94308a8877 am a4197d13: am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a4197d13b9ca7325b604564c784abc7dccf5fa01':
2012-10-31 19:39:36 -07:00
Baligh Uddin
95989e5526 am 723498fd: am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '723498fd4a8366495003684b50b9bbced4fa26cd':
  Import translations. DO NOT MERGE
2012-10-31 19:39:35 -07:00
Vikram Aggarwal
44db00933f am a27e1cb2: am ee284023: am 8d028a87: Allow wireless charging during encrypt
* commit 'a27e1cb204e2d61588ea4004790f02f7ced4bd0e':
2012-10-31 19:39:33 -07:00
Baligh Uddin
b6413e1666 am a10a75ca: am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit 'a10a75ca16eda40ce6ae171b56e2fddafb13331d':
2012-10-31 19:39:31 -07:00
Baligh Uddin
5318e5d916 am f706edfb: am 9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit 'f706edfbd4756173ce802aec53ce14ee730b87dd':
  Import translations. DO NOT MERGE
2012-10-31 19:39:30 -07:00
Michael Jurka
6df9ce11ca am 0b2bd8d1: New widget picker for keyguard widgets
* commit '0b2bd8d11d6947a6ce71db0691ba341aec7a2964':
  New widget picker for keyguard widgets
2012-10-31 18:36:03 -07:00
Eric Laurent
a6843064be am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '523d9dc460d3af22372860f4d3f83a4529257545':
2012-10-31 18:36:02 -07:00
Justin Ho
a724bb1fac am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '5da02a476944c6ca3672cf00265f7f163028a8c5':
2012-10-31 18:36:00 -07:00
Jeff Sharkey
2eec33fed7 am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '58e97bf41f1ee38d401146553d3de8678b437b8b':
2012-10-31 18:35:59 -07:00
Baligh Uddin
a4197d13b9 am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd1d9e350452e1147f9a0c5b312f869f652fb9722':
2012-10-31 18:35:57 -07:00
Baligh Uddin
723498fd4a am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'eb70ca293a2edbba128a74bb268089f4a59e1c75':
  Import translations. DO NOT MERGE
2012-10-31 18:35:56 -07:00
Vikram Aggarwal
a27e1cb204 am ee284023: am 8d028a87: Allow wireless charging during encrypt
* commit 'ee2840231ce60fcc7ae2f0fa045ffa94a2877c90':
2012-10-31 18:35:54 -07:00
Baligh Uddin
a10a75ca16 am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit '910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9':
2012-10-31 18:35:48 -07:00
Baligh Uddin
f706edfbd4 am 9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit '9ad78e880f98fdf53cb40bcdcf0f9af3ea795bc6':
  Import translations. DO NOT MERGE
2012-10-31 18:35:31 -07:00