Régis Décamps
|
5d9a2f3df0
|
am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit 'c097bb3d20a2824591a93fc07a6ffef8ddc95fa1':
minor: remove comment that primaryColor is used for ActionBar
|
2014-11-02 18:52:52 +00:00 |
|
Martin Hibdon
|
d5bded5864
|
am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '7ac3a29506003bdd1229c610a57e04d2c602f51b':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
|
2014-11-02 18:52:51 +00:00 |
|
Martin Hibdon
|
036d581c8c
|
am 4e91ba99: am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit '4e91ba99ea874edb91b5178fc3dd3ab36ad3f03a':
Don't allow disabling of the camera with managed profiles
|
2014-11-02 18:52:49 +00:00 |
|
Rohan Shah
|
22f8218ccf
|
am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '678ca4bad5c7091aa0f22b8e7643734a692d94a5':
Update colors in Email (ColorRefactor)
|
2014-11-02 18:52:48 +00:00 |
|
Martin Hibdon
|
639c2f80b8
|
am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '276f275c542405f7dede5d5258532391fec322ea':
Add ability to clear migration state to debug screen
|
2014-11-02 18:52:42 +00:00 |
|
Martin Hibdon
|
ffc9591cfc
|
am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit 'a1401e1c87cb6fe339d2709c67c628c4132241e4':
Make sure to close a cursor
|
2014-11-02 18:52:41 +00:00 |
|
James Lemieux
|
a94b86e583
|
am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '8a39dd56340050e3fdcb08c2aea806e26362b587':
Old paper clip asset is removed, which touches a test case here.
|
2014-11-02 18:52:40 +00:00 |
|
Baligh Uddin
|
4fe3ac93b8
|
am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'e6556f74ba3873d6a06bf6fe8ad839a4bda5274c':
Import translations. DO NOT MERGE
|
2014-11-02 18:52:39 +00:00 |
|
Andrew Sapperstein
|
672eb2b278
|
am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit 'b3d305103951106045f524eb76f605558ce9060d':
Renaming to support drawer under status bar.
|
2014-11-02 18:52:38 +00:00 |
|
Baligh Uddin
|
0aa4e56ffa
|
am c95fa16f: (-s ours) am 570fce60: (-s ours) am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'c95fa16f362fb56ef06aa415ac96d8d353a10665':
Import translations. DO NOT MERGE
|
2014-11-02 18:52:37 +00: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
|
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 |
|
Jin Cao
|
81bfcfad16
|
am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '5d03847c3ff543b8d74c98c9e2c76c225d22da4f':
Should use stateAlwaysHidden for inputmode
|
2014-11-02 17:44:15 +00:00 |
|
Jin Cao
|
b80fea64d0
|
am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b0ad7f784bb931fd876770c9004959322497da2c':
input mode to state hidden
|
2014-11-02 17:44:14 +00:00 |
|
Anthony Lee
|
351e982e23
|
am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:44:13 +00:00 |
|
Jin Cao
|
b9f425614d
|
am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '5b366acf0c6b02fc22af494bf244a490c71e8005':
Remove getSuggestionsAuthority
|
2014-11-02 17:44:11 +00:00 |
|
Jin Cao
|
292cf3904d
|
am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b':
Remove default search for Email
|
2014-11-02 17:44:10 +00:00 |
|
Tony Mantler
|
544b00f009
|
am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '5a33a7899b9c152c4783ad4b8725d7c7736212f0':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:44:09 +00:00 |
|
Tony Mantler
|
066c3202dc
|
am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit '89a36e1d44249c40420a710336f7eb5fa376b722':
Fix some AOSP NPEs
|
2014-11-02 17:44:08 +00:00 |
|
Anthony Lee
|
140784ce88
|
am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '61a99bbb3bcd64253dc988ab99db9ff49d903d3f':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:44:06 +00:00 |
|
Baligh Uddin
|
ce660a6ebb
|
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 'e19bbf3815b3f244f7ebee58ccc1371deca83d13':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:05 +00:00 |
|
Tony Mantler
|
ae99756ff0
|
am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '65911dc2d2ecb08c7f40e203e8268dc91afc0388':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:44:04 +00:00 |
|
Anthony Lee
|
32c3580aee
|
am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '4ae25d3b4510f3c02709090fb0c6ddf64730ddad':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:44:01 +00:00 |
|
Andrew Sapperstein
|
e80fb6cefe
|
am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ad1137d1e68b923d310423c66b73c75bb19d6345':
Use appcompat photoviewer.
|
2014-11-02 17:44:00 +00:00 |
|