Martin Hibdon
|
5eb19a6d6d
|
am 1a38750f: am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '1a38750f90e2971d38d8385557b33a746a6bce49':
Fix subfolders of the inbox.
|
2014-11-02 19:02:21 +00:00 |
|
Paul Westbrook
|
6ce676a212
|
am 74055e85: am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '74055e85a78113b1b00fbb2e22d1bc009ff58ac3':
Prevent AccountSettingsFragment from being stripped
|
2014-11-02 19:02:20 +00:00 |
|
Paul Westbrook
|
cc8f214ccd
|
am 5080a3ad: am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '5080a3adbf658a8323cf3d7eaa7247b383de41e1':
Changes to support smaller email tombstone apk size
|
2014-11-02 19:02:18 +00:00 |
|
Andrew Sapperstein
|
18a3b7a387
|
am 38b299b8: am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '38b299b8dd5e2cc174728cb7b08e625bb0cc226c':
Switch to targetSdkVersion=21. b/16408109
|
2014-11-02 19:02:16 +00:00 |
|
Baligh Uddin
|
f7e0570bc3
|
am 9cb90c3a: (-s ours) am b96905a8: (-s ours) am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '9cb90c3a60cec08fbf3ce60ed1f23144873b58bf':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:14 +00:00 |
|
Baligh Uddin
|
b665c798e2
|
am 903a81df: (-s ours) am 7bf320a7: (-s ours) am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '903a81df6de6f3affc04372d8a7d3a264455d574':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:12 +00:00 |
|
Martin Hibdon
|
6702177e81
|
am 0df19789: am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '0df19789c920acedc3f0a17cd867b6bac1e18b5a':
Display a warning if account is on security hold
|
2014-11-02 19:02:10 +00:00 |
|
Rohan Shah
|
2ca7643f4d
|
am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '13ced23c496be6b22e1f0484cd96ffb65ab5bfe3':
Tag Notifications with People (Email)
|
2014-11-02 19:02:08 +00:00 |
|
Tony Mantler
|
5b93ef6df1
|
am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit 'a6446151cc450bce7e01e07d40a54bd0de67c791':
Sync account immediately upon restore
|
2014-11-02 19:02:06 +00:00 |
|
Tony Mantler
|
26859ae360
|
am 008d5501: am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit '008d5501d91dbe67d3accb3a36eee363d71e2a91':
Use correct password dialog for outgoing settings
|
2014-11-02 19:02:04 +00:00 |
|
Tony Mantler
|
9115a12218
|
am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'eaafa9a9748709187c998a8a563a9aacb7b35a70':
Change account type strings for AccountManager UI
|
2014-11-02 19:02:02 +00:00 |
|
Baligh Uddin
|
e7c34de30c
|
am e27ea4a2: (-s ours) 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 'e27ea4a2dbf845545c1155165b20280ef646c6d8':
Import translations. DO NOT MERGE
|
2014-11-02 19:01:59 +00:00 |
|
Tony Mantler
|
dd5a7dad81
|
am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '0fa53a3367458100abed2cf2091482911c544495':
No more big yellow envelope
|
2014-11-02 19:01:57 +00:00 |
|
Paul Westbrook
|
a54d0838b7
|
resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
|
2014-11-02 11:00:40 -08:00 |
|
Martin Hibdon
|
1a38750f90
|
am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '67a1eec311ca0e37d26ed5e8db221de48f488b7c':
Fix subfolders of the inbox.
|
2014-11-02 18:52:36 +00:00 |
|
Paul Westbrook
|
74055e85a7
|
am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '7bee86e74d6f79eded57af287f49d41a53e66806':
Prevent AccountSettingsFragment from being stripped
|
2014-11-02 18:52:35 +00:00 |
|
Paul Westbrook
|
5080a3adbf
|
am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '6a62de22e14b9b01274f14aacfcbf968a7da39dc':
Changes to support smaller email tombstone apk size
|
2014-11-02 18:52:34 +00:00 |
|
Andrew Sapperstein
|
38b299b8dd
|
am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit 'e2ab82c801896c371d94fd249a662a911dc0cd34':
Switch to targetSdkVersion=21. b/16408109
|
2014-11-02 18:52:33 +00:00 |
|
Baligh Uddin
|
9cb90c3a60
|
am b96905a8: (-s ours) am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'b96905a87194e82ec823fc8abccadc66df8cf4c9':
Import translations. DO NOT MERGE
|
2014-11-02 18:52:32 +00:00 |
|
Baligh Uddin
|
903a81df6d
|
am 7bf320a7: (-s ours) am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '7bf320a78438fe2cfb7d9d6ad42f631d1fae7a4e':
Import translations. DO NOT MERGE
|
2014-11-02 18:52:31 +00:00 |
|
Martin Hibdon
|
0df19789c9
|
am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '472880614e9d72916b18a3840df119a43ca667e7':
Display a warning if account is on security hold
|
2014-11-02 18:52:29 +00:00 |
|
Rohan Shah
|
13ced23c49
|
am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit 'f8ae0f7bfbaf7619bd91d4bb60e9aebb062199d2':
Tag Notifications with People (Email)
|
2014-11-02 18:52:28 +00:00 |
|
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 |
|
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 |
|