Vikram Aggarwal
902ad8759c
am 86508085: Remove further logging
...
* commit '86508085ea181f2d514569a5cf4fe0633d90b843':
Remove further logging
2012-10-08 13:32:52 -07:00
Vikram Aggarwal
86508085ea
Remove further logging
...
Bug: 7302014 CryptKeeper logs PII data
Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
2012-10-08 12:59:54 -07:00
Jake Hamby
c71d0505b9
am 58f59428: am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
...
* commit '58f594284efb98737f5435b8463ab0e28895fe60':
Allow disconnected BT profiles to be unchecked in Settings.
2012-10-08 12:19:46 -07:00
Jake Hamby
58f594284e
am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
...
* commit '837bb033200ccd988586af7a0b6032ee9d6b9673':
Allow disconnected BT profiles to be unchecked in Settings.
2012-10-08 12:18:10 -07:00
Jake Hamby
837bb03320
am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
...
* commit '283dce21b4902b1d0fa77c26f37f885203647d3a':
Allow disconnected BT profiles to be unchecked in Settings.
2012-10-08 12:15:46 -07:00
Jake Hamby
283dce21b4
Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
2012-10-08 12:13:14 -07:00
Vikram Aggarwal
ab462aebec
am f36ebae7: am 075dfeaa: am c3ebad20: Remove verbose logging
...
* commit 'f36ebae7a29387452af71730767aba6a00f23094':
Remove verbose logging
2012-10-08 10:57:18 -07:00
Baligh Uddin
e8256fa58d
am 42466cdd: (-s ours) am e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '42466cddc3ec20823669b07693bf1d764b737577':
Import translations. DO NOT MERGE
2012-10-08 10:56:26 -07:00
Baligh Uddin
7dc4eb9b09
am cd8234e6: (-s ours) am 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'cd8234e6065d8dfa6c8a701df07c98a5864b1d30':
Import translations. DO NOT MERGE
2012-10-08 10:56:25 -07:00
Vikram Aggarwal
f36ebae7a2
am 075dfeaa: am c3ebad20: Remove verbose logging
...
* commit '075dfeaaac139a20cf24890b3d6e4c395124621e':
Remove verbose logging
2012-10-08 10:06:05 -07:00
Vikram Aggarwal
075dfeaaac
am c3ebad20: Remove verbose logging
...
* commit 'c3ebad20f24299a680caa4ab70e22e9042df405e':
Remove verbose logging
2012-10-08 10:04:04 -07:00
Vikram Aggarwal
c3ebad20f2
Remove verbose logging
...
Bug: 7302014 CryptKeeper logs PII data
Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
2012-10-08 09:13:07 -07:00
Baligh Uddin
42466cddc3
am e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e5351aab40c39f44d28bb6bc0213b67ef3adb9d2':
Import translations. DO NOT MERGE
2012-10-08 07:55:56 -07:00
Baligh Uddin
cd8234e606
am 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '36391cc61a013e6932513c100a2128a668ac4e27':
Import translations. DO NOT MERGE
2012-10-08 07:55:55 -07:00
Baligh Uddin
e5351aab40
am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'df54b396941adb14107ce54a61b78f2a9378ec09':
Import translations. DO NOT MERGE
2012-10-08 07:55:08 -07:00
Baligh Uddin
431fe6aa36
Merge "Import translations. DO NOT MERGE"
2012-10-08 07:54:51 -07:00
Baligh Uddin
36391cc61a
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-08 07:54:28 -07:00
Baligh Uddin
df54b39694
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-08 07:53:46 -07:00
The Android Automerger
15bebe0da0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 16:05:35 -07:00
Amith Yamasani
95867c3892
am 0f136cfd: am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev
...
* commit '0f136cfd4fcb570a94157f4f2044c0e6e7bff74e':
Fix layout for decryption password entry.
2012-10-07 14:08:26 -07:00
Amith Yamasani
0f136cfd4f
am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev
...
* commit '40cbecb8c3081c778c2a83d80b71981f2f4bb169':
Fix layout for decryption password entry.
2012-10-07 14:06:03 -07:00
Amith Yamasani
40cbecb8c3
am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev
...
* commit '29707a501c6f61108e479a6129e89791dc5a1f36':
Fix layout for decryption password entry.
2012-10-07 14:04:10 -07:00
Amith Yamasani
29707a501c
Merge "Fix layout for decryption password entry." into jb-mr1-dev
2012-10-07 14:02:26 -07:00
Svetoslav Ganov
b402660ccd
am 5c9283fb: am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.
...
* commit '5c9283fbf824c6ca50ed6f28cccdd9c1ab0c1db2':
Clean up 'accessibility shortcut' screen.
2012-10-07 12:07:29 -07:00
Svetoslav Ganov
5c9283fbf8
am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen.
...
* commit '450a7ad6a35c25d1307c90e364590b32ea44d2fa':
Clean up 'accessibility shortcut' screen.
2012-10-07 12:05:13 -07:00
Svetoslav Ganov
450a7ad6a3
am 7e54c544: Clean up \'accessibility shortcut\' screen.
...
* commit '7e54c544aa3b16245486cf3787e79cab5bbdb651':
Clean up 'accessibility shortcut' screen.
2012-10-07 12:03:45 -07:00
Svetoslav Ganov
7e54c544aa
Clean up 'accessibility shortcut' screen.
...
1. Last polishes to the accessibility shortcut screen.
bug:7298927
Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
2012-10-07 11:48:57 -07:00
The Android Automerger
65eedd181c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 06:59:55 -07:00
Amith Yamasani
d2e414c2b6
Fix layout for decryption password entry.
...
Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.
Also removed some vestigial keyboard view in the layout.
Bug: 7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
2012-10-07 06:34:47 -07:00
Amith Yamasani
f731e47a36
am 60b4d615: am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
...
* commit '60b4d615c619aaf268fd3d1fd101f7524756b3fb':
Revert "Show warning dialog in a multiuser system when adding a new account."
2012-10-05 20:58:23 -07:00
Amith Yamasani
60b4d615c6
am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
...
* commit 'a1e1960890f05e2e4afd9ad3bf2f68636100152e':
Revert "Show warning dialog in a multiuser system when adding a new account."
2012-10-05 20:56:13 -07:00
Amith Yamasani
a1e1960890
am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
...
* commit '0b146b238496fdb36ad575f9a0b96dc43f812aa3':
Revert "Show warning dialog in a multiuser system when adding a new account."
2012-10-05 20:54:35 -07:00
Amith Yamasani
0b146b2384
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
2012-10-05 20:53:03 -07:00
Amith Yamasani
21c2904ba3
Revert "Show warning dialog in a multiuser system when adding a new account."
...
This reverts commit eb71f26897
2012-10-05 19:56:18 -07:00
Baligh Uddin
28be694aa0
Import translations. DO NOT MERGE
...
Change-Id: Idde76e1ee183e5d2acadc98d6e100b4d85032313
Auto-generated-cl: translation import
2012-10-05 16:31:58 -07:00
Baligh Uddin
b1597fca1f
Import translations. DO NOT MERGE
...
Change-Id: I370e6491b374c4c828b128955eefce762335fa52
Auto-generated-cl: translation import
2012-10-05 16:29:40 -07:00
Baligh Uddin
9be89088da
Import translations. DO NOT MERGE
...
Change-Id: I6c6a598c03f12d3ac9e9a3cc08d479d7b8f1f274
Auto-generated-cl: translation import
2012-10-05 16:27:44 -07:00
Adam Cohen
3757a635a6
am e7be6192: am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
...
* commit 'e7be6192ed7337d81a77ad1da11dba2c578929c7':
Fixing filter for status widget (issue 7295596)
2012-10-05 14:21:18 -07:00
Svetoslav Ganov
4b4297f7fc
am 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings.
...
* commit '2c72ba6de2e2dbce1278ef67db0e65439c9c1577':
Updating the screen magnification strings.
2012-10-05 14:21:17 -07:00
Adam Cohen
e7be6192ed
am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
...
* commit '517f5cede9c61c981e0759798664914201b5d0e2':
Fixing filter for status widget (issue 7295596)
2012-10-05 14:20:14 -07:00
Svetoslav Ganov
2c72ba6de2
am 3b1520ee: am 78995994: Updating the screen magnification strings.
...
* commit '3b1520eed7566e03244e6fc1aa307c2155bd6e69':
Updating the screen magnification strings.
2012-10-05 14:18:51 -07:00
Adam Cohen
517f5cede9
am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
...
* commit '1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
Fixing filter for status widget (issue 7295596)
2012-10-05 14:18:24 -07:00
Svetoslav Ganov
3b1520eed7
am 78995994: Updating the screen magnification strings.
...
* commit '78995994b9b0afbc4c4705e41d1c4ac944e557f2':
Updating the screen magnification strings.
2012-10-05 14:16:58 -07:00
Adam Cohen
1f9a07b5e9
Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
2012-10-05 14:16:42 -07:00
Svetoslav Ganov
78995994b9
Updating the screen magnification strings.
...
bug:7295457
Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
2012-10-05 14:13:42 -07:00
Jeff Sharkey
897c3c8937
am f49a4702: am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
...
* commit 'f49a470253c8310b024b6121b782e70b2f5f935a':
Avoid NPE when missing PackageInfo.
2012-10-05 13:59:08 -07:00
Jeff Sharkey
f49a470253
am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
...
* commit 'dd51496cf3c1b1e5e24652a669c3889e1c31720d':
Avoid NPE when missing PackageInfo.
2012-10-05 13:57:22 -07:00
Jeff Sharkey
dd51496cf3
am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
...
* commit '4a58b1006cec93565a7106c117b2c87248341404':
Avoid NPE when missing PackageInfo.
2012-10-05 13:55:36 -07:00
Jeff Sharkey
4a58b1006c
Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
2012-10-05 13:53:39 -07:00
Svetoslav Ganov
381a95b209
am eb8c57d9: am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog.
...
* commit 'eb8c57d909d1498639d32e82bdda52393ed761ee':
Locale selection settings do not hide warning dialog.
2012-10-05 13:52:37 -07:00
