Carlos Valdivia
4069299a4c
am 15fbbbc8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '15fbbbc8b142f110ec96994310505b81ba9c08ca':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 18:32:01 +00:00
Vinit Deshpande
c471629c7d
am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:25:46 +00:00
Vinit Deshpande
57bef54bef
am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:25:06 +00:00
Vinit Deshpande
0a11f60595
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
2014-09-11 18:17:00 +00:00
Svetoslav
a6e4db3ce0
am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:40:06 +00:00
Carlos Valdivia
15fbbbc8b1
am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'f79797c8853741e80668f1d91c4d7d1a076bac18':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:40:03 +00:00
Svetoslav
842e9d04ad
am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:39:26 +00:00
Carlos Valdivia
a8627dd88e
am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'f79797c8853741e80668f1d91c4d7d1a076bac18':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:39:25 +00:00
Dan Sandler
f8aaaeedbf
am 89a2ea10: am 2cbeed2f: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
...
* commit '89a2ea108df13443e66eeb597d1df2875596511e':
Show a better list of apps.
2014-09-11 17:32:23 +00:00
Zoltan Szatmary-Ban
727ce2f3d9
am ecd8f7aa: am 70118662: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'ecd8f7aaf1cd2c984c4c9408de228676dd3d38d7':
Check for DeviceAdminInfo type before casting
2014-09-11 17:32:08 +00:00
Zoltan Szatmary-Ban
bd6d138fd3
am 212a2dbb: am 12b90be9: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit '212a2dbb21a4651bde7da5dc4b26b3cce41e2f77':
Fixing Trusted Credentials Settings crash
2014-09-11 17:31:33 +00:00
Svetoslav
72cfbcb429
Merge "Fix print icons in settings." into lmp-dev
2014-09-11 17:28:32 +00:00
Fabrice Di Meglio
75027353fd
am ab7a2951: am 6e0e1483: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
...
* commit 'ab7a2951e0f595f7378cf18a7be3ad86371851e4':
Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-11 17:27:29 +00:00
PauloftheWest
ac0af801ac
am c0a2603e: am 3c46239f: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'c0a2603e5a86c52dcb7f2c9c5754808dfc84eb0f':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 17:26:24 +00:00
Jim Miller
a878af34eb
am 447264d5: am 807c02ed: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit '447264d5728da3cb25a11548c91983253ebd259d':
Keep unlock attempt count after configuration change
2014-09-11 17:25:39 +00:00
PauloftheWest
8e38f30c26
am 4f006d9d: am e9cb4bf2: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
...
* commit '4f006d9dd14cc5efe0dc454c29d9845ce84cf466':
Made Bluetooth device dialog fully scrollable.
2014-09-11 17:25:22 +00:00
John Spurlock
b9b559cfa6
am a3eee6fb: am 4fba99a9: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
...
* commit 'a3eee6fb2d94561f1d2b28be1b6f1255d95fbb29':
Settings: Remove fixed dropdown width from "From" pref.
2014-09-11 17:25:19 +00:00
Carlos Valdivia
f79797c885
am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'ea2fa0d98a9777e37815624bf3e4345b4c6df643':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:25:05 +00:00
PauloftheWest
8e9aef81cf
am 94f927b6: am 4e5e8a92: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
...
* commit '94f927b6d54b783651fbde770465b3a9f47468a2':
Updated Bluetooth keyboard icon to teal.
2014-09-11 17:24:17 +00:00
Jason Monk
becbb93a8d
am a9681ddb: am 540743d4: am 062f736c: Adding zen mode condition dialog
...
* commit 'a9681ddb17398ce36e24e5dae0ea483db5ad7b2f':
Adding zen mode condition dialog
2014-09-11 17:22:30 +00:00
Fabrice Di Meglio
75cefd093c
am e384b253: am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
...
* commit 'e384b2534b5230d61cfb88e136528002a187533b':
Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
2014-09-11 17:22:19 +00:00
Carlos Valdivia
ea2fa0d98a
am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'db591467f6ae0e082c0ce627874a851f1926d63a':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:12:11 +00:00
Carlos Valdivia
db591467f6
am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:05:31 +00:00
Carlos Valdivia
737d2d538b
am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '61ced6d4270b86c336520856cb1545865cb01107':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:59:49 +00:00
Carlos Valdivia
61ced6d427
am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:49:32 +00:00
Carlos Valdivia
01137c2004
am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:42:54 +00:00
Carlos Valdivia
663b4e9733
am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:37:09 +00:00
Baligh Uddin
a2e918af43
am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
2014-09-11 16:11:13 +00:00
Baligh Uddin
e69b7d19f3
am 0d2c8d34: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '0d2c8d34d9f22c0e28682e87133d5dff63feb311':
Import translations. DO NOT MERGE
2014-09-11 16:04:14 +00:00
Dan Sandler
e98bee54be
am 1fb51987: Merge "Show a better list of apps." into lmp-dev
...
* commit '1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
2014-09-11 16:01:27 +00:00
Zoltan Szatmary-Ban
55cd479d55
am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
2014-09-11 16:01:24 +00:00
Zoltan Szatmary-Ban
b46eeeb7be
am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
2014-09-11 16:01:14 +00:00
Fabrice Di Meglio
b88d24df0e
am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
...
* commit 'f8310c18508275b1125e7677579fd610cecf29c6':
Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-11 15:59:01 +00:00
Baligh Uddin
0d2c8d34d9
am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
2014-09-11 15:58:44 +00:00
PauloftheWest
23d0ac4491
am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 15:58:20 +00:00
Jim Miller
f496ae9413
am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit 'ca03758ed6399d73c841bec8685ea1f19bf38fea':
Keep unlock attempt count after configuration change
2014-09-11 15:57:42 +00:00
Baligh Uddin
9b45212b1d
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-11 15:49:25 +00:00
Baligh Uddin
321b25a144
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-11 15:49:24 +00:00
Baligh Uddin
330ac54067
Merge "Import translations. DO NOT MERGE"
2014-09-11 15:49:22 +00:00
John Spurlock
aa03280db7
am 2c19551e: am a2f9e2a2: am 1e7dbd45: Settings: Use the same day sequence for downtime.
...
* commit '2c19551efba348e3e378159bac62980a5fbad91f':
Settings: Use the same day sequence for downtime.
2014-09-11 14:14:13 +00:00
John Spurlock
c46156277a
am 77056e3f: am 740eeb97: am cddb2954: Settings: Make downtime days scrollable.
...
* commit '77056e3f04dcacea63a7da0cbb3483e91927e3d1':
Settings: Make downtime days scrollable.
2014-09-11 14:14:12 +00:00
Dan Sandler
89a2ea108d
am 2cbeed2f: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
...
* commit '2cbeed2f3e5ffa10bf5031450e1e81b611876c53':
Show a better list of apps.
2014-09-11 12:16:40 +00:00
Dan Sandler
2cbeed2f3e
am 1fb51987: Merge "Show a better list of apps." into lmp-dev
...
* commit '1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
2014-09-11 12:06:52 +00:00
Dan Sandler
1fb5198732
Merge "Show a better list of apps." into lmp-dev
2014-09-11 11:58:55 +00:00
Zoltan Szatmary-Ban
ecd8f7aaf1
am 70118662: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit '70118662623118ca224fcd929838d1cbb2f9a73e':
Check for DeviceAdminInfo type before casting
2014-09-11 11:05:40 +00:00
Zoltan Szatmary-Ban
7011866262
am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
2014-09-11 11:00:28 +00:00
Zoltan Szatmary-Ban
cf911d107a
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
2014-09-11 10:52:57 +00:00
Zoltan Szatmary-Ban
212a2dbb21
am 12b90be9: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit '12b90be92b66f96f8ab81cc8938abbac8bd0b429':
Fixing Trusted Credentials Settings crash
2014-09-11 09:43:33 +00:00
Zoltan Szatmary-Ban
12b90be92b
am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
2014-09-11 09:34:24 +00:00
Zoltan Szatmary-Ban
f572fdd132
Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
2014-09-11 09:23:55 +00:00