Baligh Uddin
e386f32521
am 7c99551a
: am 18facce4
: am e3a4a5fd
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7c99551aaca4f9f19c0d47d71ff6fc6a71a45ad2':
2012-11-05 15:38:25 -08:00
Baligh Uddin
f5e9cca7a0
am 94c4b78a
: am ecfe5f0d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '94c4b78acb387aa926a3fbdf4efd7b14e8edc45e':
Import translations. DO NOT MERGE
2012-11-05 15:38:24 -08:00
Baligh Uddin
7c99551aac
am 18facce4
: am e3a4a5fd
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '18facce4183adc1b058f9d04f3dfd3fe1e8fae2f':
2012-11-05 15:36:00 -08:00
Baligh Uddin
94c4b78acb
am ecfe5f0d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'ecfe5f0d4c31151ee8585ec5521ced2e6e6581b9':
Import translations. DO NOT MERGE
2012-11-05 15:35:55 -08:00
The Android Open Source Project
8926c73425
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3275f5314289403f5cd8e8accceec4f38404c7d1
2012-11-05 14:21:32 -08:00
Baligh Uddin
c82b385ba2
am 50bfc55e
: am e3a4a5fd
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '50bfc55e4190a2ffdadd9a9eb318e5c948ba7e66':
Import translations. DO NOT MERGE
2012-11-05 14:15:12 -08:00
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
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
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
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
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
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
bfb6450503
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d
2012-11-01 07:52:39 -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
The Android Automerger
eed7a47758
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-31 18:34:23 -07:00
Dianne Hackborn
4de4061c8b
Fix issue #7448596 : Can't uninstall app that was installed by another user
...
Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c
2012-10-31 18:12:03 -07:00
Michael Jurka
0b2bd8d11d
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
2012-10-31 16:46:24 -07:00
The Android Open Source Project
d8515a1d78
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I40ce39e6f067e352b19562897b2baf2bab3b6a39
2012-10-31 09:18:37 -07:00
The Android Automerger
859ce033ec
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:12:35 -07:00
Eric Laurent
ebcfb8e8d8
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
2012-10-30 14:15:32 -07:00
Eric Laurent
523d9dc460
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
2012-10-30 14:14:40 -07:00
Eric Laurent
d6287242c2
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
2012-10-30 14:14:14 -07:00
Eric Laurent
f79daa9420
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
2012-10-30 14:12:23 -07:00
Justin Ho
749ec9fc21
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.
2012-10-30 11:20:28 -07:00
Justin Ho
d1c99a3d7e
am 29c4c88b
: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
...
* commit '29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
2012-10-30 11:18:26 -07:00