Tony Mantler
|
a6446151cc
|
am 93d419dd : am 40feb8f9 : am 65d130ad : am b3be4655 : Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit '93d419dd2d61962974f288e5b640477d26da2825':
Sync account immediately upon restore
|
2014-11-02 18:52:27 +00:00 |
|
Tony Mantler
|
008d5501d9
|
am a78ba75e : am f44d334f : am ebfa64a7 : am ce6e2de7 : Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit 'a78ba75e45680484cfeb95f80f13f2127f76ed1e':
Use correct password dialog for outgoing settings
|
2014-11-02 18:52:25 +00:00 |
|
Tony Mantler
|
eaafa9a974
|
am 22538106 : am d8800386 : am 2d3730b5 : am cb45d6fa : Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit '2253810635b44672c654cbf6c23f6babbf00c645':
Change account type strings for AccountManager UI
|
2014-11-02 18:52:23 +00:00 |
|
Baligh Uddin
|
e27ea4a2db
|
am 85313f47 : (-s ours) am abc613bf : (-s ours) am dc956891 : (-s ours) am efca9af6 : (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '85313f47b7761e95f00b625d1ab7f0c3aa2ea808':
Import translations. DO NOT MERGE
|
2014-11-02 18:52:22 +00:00 |
|
Tony Mantler
|
0fa53a3367
|
am 99219eb0 : am 86dda976 : am a79eed71 : am c6d5ec49 : No more big yellow envelope
* commit '99219eb0e301e75f392861b7282eec342864c62e':
No more big yellow envelope
|
2014-11-02 18:52:20 +00:00 |
|
Paul Westbrook
|
6666fbf090
|
resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
|
2014-11-02 10:49:50 -08:00 |
|
Paul Westbrook
|
7dd59de700
|
am 2ca250a9 : am 47ee4637 : resolved conflicts for merge of 19809304 to lmp-sprout-dev
* commit '2ca250a9b7cdf835bb86dd8e926d71e23c6a1f37':
|
2014-11-02 18:41:30 +00:00 |
|
Paul Westbrook
|
2ca250a9b7
|
am 47ee4637 : resolved conflicts for merge of 19809304 to lmp-sprout-dev
* commit '47ee4637293ed77e9e03cc43c64ddc3cb1c6b525':
|
2014-11-02 18:36:49 +00:00 |
|
Paul Westbrook
|
47ee463729
|
resolved conflicts for merge of 19809304 to lmp-sprout-dev
Change-Id: Idf62af52625ad5c5a5b99d9f0067d49e9128b5e9
|
2014-11-02 10:33:04 -08:00 |
|
Tony Mantler
|
c1ad14a93e
|
am 8eca7d6a : am ee2a66b5 : am 3fb948e4 : am 800d544a : am 8c6a01f8 : Remove app icon from Setup and Mailbox Settings
* commit '8eca7d6a5077754dbc3f1ec78506458a3384efb0':
Remove app icon from Setup and Mailbox Settings
|
2014-11-02 17:50:43 +00:00 |
|
Tony Mantler
|
95d12ced49
|
am e46c6c10 : am 685f2f1d : am 784b61cc : am 34a686ab : am dfb7fe91 : Remove password spaces warning
* commit 'e46c6c10c02c8a6041b1c6d725abb262b570725f':
Remove password spaces warning
|
2014-11-02 17:50:42 +00:00 |
|
Tony Mantler
|
a3806ec48c
|
am 31c4a2d0 : am 47a2f0f7 : am cd77bc1b : am 58310123 : am 0ee42176 : Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '31c4a2d0451f1467c96cdf89d4bd1f9ec8fcb266':
Fix spinners layout mangling
|
2014-11-02 17:50:41 +00:00 |
|
Paul Westbrook
|
fdfa501250
|
am 8969e378 : am 54013128 : am 091ed0db : am b4986725 : am 6a07fc19 : Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '8969e378d990adddb4652b05953276406c7dfd24':
Remove unused resource
|
2014-11-02 17:50:40 +00:00 |
|
Martin Hibdon
|
0916e2dc5d
|
am b0a19219 : am 4113c904 : am 2562a4df : am 61e79746 : am c845295f : Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit 'b0a1921985d46e9591e2687f0faf18306f6a868f':
Fix the text of the authentication label on rotation
|
2014-11-02 17:50:39 +00:00 |
|
Andrew Sapperstein
|
a2f4826db7
|
am 52b81bfe : am 0f493a86 : am ec83f7fa : am 5b5d5585 : am 86e17ba1 : Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '52b81bfe5befb792b5b2c0245463088faf393ba8':
Set recents color for photoviewer. b/17389434
|
2014-11-02 17:50:38 +00:00 |
|
James Lemieux
|
8ecf96eb82
|
am a341c92d : am 93d724aa : am 46f73c05 : am 7266502c : am 3bdce9b5 : Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit 'a341c92d59643b701f0c5b25ca9706891e4d423d':
Remove server-side sanitized HTML capability; add client-side santized HTML capability
|
2014-11-02 17:50:37 +00:00 |
|
Tony Mantler
|
c59b73474f
|
am a59fce8e : am e62810f7 : am ac26021d : am d50e207f : am 65669454 : Set IME resize flag for AccountServerSettingsActivity
* commit 'a59fce8ebac2ad866efefe4d86ce6160546d1f2e':
Set IME resize flag for AccountServerSettingsActivity
|
2014-11-02 17:50:36 +00:00 |
|
James Lemieux
|
ccc15a7f47
|
am 386c3357 : am 32a6138d : am 325afc41 : am 04c77181 : am 1be8b05b : The error message "This field can\'t be blank" can be ignored
* commit '386c33574c73f0abaad05fb137d20834ec99dc12':
The error message "This field can't be blank" can be ignored
|
2014-11-02 17:50:35 +00:00 |
|
Baligh Uddin
|
5447fb433e
|
am ec1fa677 : (-s ours) am c7332f11 : (-s ours) am dd454375 : (-s ours) am 9ea9d245 : (-s ours) am efb6cb25 : (-s ours) Import translations. DO NOT MERGE
* commit 'ec1fa677bd240a529aed0ff80c9ae90562be7e1e':
Import translations. DO NOT MERGE
|
2014-11-02 17:50:34 +00:00 |
|
Tony Mantler
|
65516fd9f2
|
am bcf42ff1 : am 91232a21 : am 39aa4910 : am 882e1a89 : am e068440f : Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit 'bcf42ff14b1ccb8f86fa27a33878217c7f2a5333':
Update search folder status in a finally block
|
2014-11-02 17:50:33 +00:00 |
|
Martin Hibdon
|
e5f590518b
|
am 2d488bf4 : am 1db58a95 : am 2569cfcb : am 2ff1a5cd : am e87b38fa : Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '2d488bf43d30749269f5f01c35474ed6d7f98d05':
Prevent account reconcilliation during migration
|
2014-11-02 17:50:32 +00:00 |
|
Martin Hibdon
|
6c8332b1ff
|
am 059c6f36 : am 341c8ef2 : am 33ab7b34 : am 30d8d696 : am 51c65364 : Put debug screen back into settings
* commit '059c6f36c46e36092c71efacd95615fe09abef90':
Put debug screen back into settings
|
2014-11-02 17:50:31 +00:00 |
|
Baligh Uddin
|
fe03f4cc11
|
am 0d0d4d27 : (-s ours) am 0a7f63e0 : (-s ours) am eb3588bc : (-s ours) am 94d76eb9 : (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '0d0d4d27116f5b1d2d56c484015b33d764cae06a':
Import translations. DO NOT MERGE
|
2014-11-02 17:50:29 +00:00 |
|
Jin Cao
|
5869bbf7d7
|
am 81bfcfad : am 5d03847c : am 0b27b809 : am 8d6c6348 : Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '81bfcfad16c2ceb29821a5810cd9c79d8c6b015b':
Should use stateAlwaysHidden for inputmode
|
2014-11-02 17:50:28 +00:00 |
|
Jin Cao
|
1ff3372356
|
am b80fea64 : am b0ad7f78 : am cdf59599 : am b7a5a10d : Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b80fea64d03423f735d93cc449503ea430418662':
input mode to state hidden
|
2014-11-02 17:50:27 +00:00 |
|
Anthony Lee
|
58422f63aa
|
am 351e982e : am fb120f7c : am dc952e5d : am 7ef66423 : b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit '351e982e23729827093580afb2151d8e3d89017a':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:50:26 +00:00 |
|
Jin Cao
|
5c2092481a
|
am b9f42561 : am 5b366acf : am ac026ecb : am 0d2f843d : Remove getSuggestionsAuthority automerge: 65c2179
* commit 'b9f425614de8dbcd958a84840dc93bb434cb5cd4':
Remove getSuggestionsAuthority
|
2014-11-02 17:50:25 +00:00 |
|
Jin Cao
|
ab5dac4852
|
am 292cf390 : am d0a67be9 : am a357f81e : am 1991e2a9 : Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit '292cf3904db5971272dd03cc83ec97814926ff6a':
Remove default search for Email
|
2014-11-02 17:50:23 +00:00 |
|
Tony Mantler
|
eb7a2e7811
|
am 544b00f0 : am 5a33a789 : am c48b9669 : am 65bf9945 : Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '544b00f00989b11b70b9c150d0d856964a28f390':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:50:22 +00:00 |
|
Tony Mantler
|
b1a155d7c0
|
am 066c3202 : am 89a36e1d : am ea73ce47 : am c71afebb : Fix some AOSP NPEs automerge: 473ce1f
* commit '066c3202dc4c96e069c8d50dfe61b2cb89c8e5d4':
Fix some AOSP NPEs
|
2014-11-02 17:50:21 +00:00 |
|
Anthony Lee
|
07be492033
|
am 140784ce : am 61a99bbb : am 4f5e86fc : am 982394da : Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '140784ce881fb8e7d222053b7dcc69c48bca345f':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:50:19 +00:00 |
|
Baligh Uddin
|
29159203b5
|
am ce660a6e : (-s ours) am e19bbf38 : (-s ours) am ee7eda0c : (-s ours) am 7e1932f7 : (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'ce660a6ebb52d2f31e40d646969ad244c6575bc3':
Import translations. DO NOT MERGE
|
2014-11-02 17:50:18 +00:00 |
|
Tony Mantler
|
9021503843
|
am ae99756f : am 65911dc2 : am 831bb0ab : am b0432334 : Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit 'ae99756ff05580928b2ffb8511f49ee220631165':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:50:17 +00:00 |
|
Anthony Lee
|
a677c1121b
|
am 32c3580a : am 4ae25d3b : am ca31da91 : am 9d1dc789 : b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '32c3580aeef9de32750efae9cdf16284e0cfe890':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:50:15 +00:00 |
|
Andrew Sapperstein
|
5a841aff1d
|
am e80fb6ce : am ad1137d1 : am ecb6fc31 : am 69dda480 : Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'e80fb6cefe1dba9fb90288618b7b36b88cf557b0':
Use appcompat photoviewer.
|
2014-11-02 17:50:14 +00:00 |
|
Tony Mantler
|
d59532d99b
|
am 87ff47b6 : am 49c8521d : am 214cf5cf : am e34c3677 : Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '87ff47b6accd40cf747f80824a38c2d8e39f3da8':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 17:50:12 +00:00 |
|
Tony Mantler
|
8eca7d6a50
|
am ee2a66b5 : am 3fb948e4 : am 800d544a : am 8c6a01f8 : Remove app icon from Setup and Mailbox Settings
* commit 'ee2a66b5b0632a2bbc09ebdfc555235eb56c1f27':
Remove app icon from Setup and Mailbox Settings
|
2014-11-02 17:44:30 +00:00 |
|
Tony Mantler
|
e46c6c10c0
|
am 685f2f1d : am 784b61cc : am 34a686ab : am dfb7fe91 : Remove password spaces warning
* commit '685f2f1d649c499622ef1c1ded523ab9b11574cc':
Remove password spaces warning
|
2014-11-02 17:44:29 +00:00 |
|
Tony Mantler
|
31c4a2d045
|
am 47a2f0f7 : am cd77bc1b : am 58310123 : am 0ee42176 : Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '47a2f0f73a5387de440cef1c42ff63d99189501d':
Fix spinners layout mangling
|
2014-11-02 17:44:28 +00:00 |
|
Paul Westbrook
|
8969e378d9
|
am 54013128 : am 091ed0db : am b4986725 : am 6a07fc19 : Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '54013128472cdcf313295ee2e20ccb59df076da1':
Remove unused resource
|
2014-11-02 17:44:27 +00:00 |
|
Martin Hibdon
|
b0a1921985
|
am 4113c904 : am 2562a4df : am 61e79746 : am c845295f : Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit '4113c904f847699c6c2006ff6604462494034c19':
Fix the text of the authentication label on rotation
|
2014-11-02 17:44:26 +00:00 |
|
Andrew Sapperstein
|
52b81bfe5b
|
am 0f493a86 : am ec83f7fa : am 5b5d5585 : am 86e17ba1 : Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '0f493a8618668d859464b006e36a7f7642784e56':
Set recents color for photoviewer. b/17389434
|
2014-11-02 17:44:25 +00:00 |
|
James Lemieux
|
a341c92d59
|
am 93d724aa : am 46f73c05 : am 7266502c : am 3bdce9b5 : Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit '93d724aa2b58a9035eac467f53fe9af56e0b3043':
Remove server-side sanitized HTML capability; add client-side santized HTML capability
|
2014-11-02 17:44:23 +00:00 |
|
Tony Mantler
|
a59fce8eba
|
am e62810f7 : am ac26021d : am d50e207f : am 65669454 : Set IME resize flag for AccountServerSettingsActivity
* commit 'e62810f7f6478efd1131ea2dba5ad3dc8e62a515':
Set IME resize flag for AccountServerSettingsActivity
|
2014-11-02 17:44:22 +00:00 |
|
James Lemieux
|
386c33574c
|
am 32a6138d : am 325afc41 : am 04c77181 : am 1be8b05b : The error message "This field can\'t be blank" can be ignored
* commit '32a6138d5afcc29b9a921928f5769f8a15e52d4c':
The error message "This field can't be blank" can be ignored
|
2014-11-02 17:44:21 +00:00 |
|
Baligh Uddin
|
ec1fa677bd
|
am c7332f11 : (-s ours) am dd454375 : (-s ours) am 9ea9d245 : (-s ours) am efb6cb25 : (-s ours) Import translations. DO NOT MERGE
* commit 'c7332f11fb214711623c82735234138f191ce540':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:20 +00:00 |
|
Tony Mantler
|
bcf42ff14b
|
am 91232a21 : am 39aa4910 : am 882e1a89 : am e068440f : Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit '91232a21f0b0d68ec5da8970199c899b3da3ce31':
Update search folder status in a finally block
|
2014-11-02 17:44:19 +00:00 |
|
Martin Hibdon
|
2d488bf43d
|
am 1db58a95 : am 2569cfcb : am 2ff1a5cd : am e87b38fa : Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '1db58a95beb22f763e2d6fc9f39f936cf4855908':
Prevent account reconcilliation during migration
|
2014-11-02 17:44:18 +00:00 |
|
Martin Hibdon
|
059c6f36c4
|
am 341c8ef2 : am 33ab7b34 : am 30d8d696 : am 51c65364 : Put debug screen back into settings
* commit '341c8ef2eca38c26f9837868b40dedcc47e6b470':
Put debug screen back into settings
|
2014-11-02 17:44:17 +00:00 |
|
Baligh Uddin
|
0d0d4d2711
|
am 0a7f63e0 : (-s ours) am eb3588bc : (-s ours) am 94d76eb9 : (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '0a7f63e01f8dfed2765867854e4a4f23c2eb0a27':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:16 +00:00 |
|