FP2-1992: Email: Integrate latest AOSP fixes and improvements
commit eff8871972e1b46b308c5538dbb7170d68b107ba
Merge remote-tracking branch 'aosp/marshmallow-mr2-release' into HEAD
commit a29687edf0d6758c33a70a2e42a42b702fc44a3f
Patch Exchange Autodiscover Code for Security Issue
The change removes the unauthenticated GET fallback attempt for the
Autodiscover process. Given that the Autodiscover code is functionally broken
and this fallback attempt wouldn't succeed unless an attacker faked a success
response, a good way to patch the security issue is to disable the attempt.
The change also updates the request content type, disables automatic
redirects, and allows for parsing namespaces to help the first two attempts
succeed. As this is not meant to be a functional patch but a security patch,
there are no further changes to the Autodiscover code.
commit 521e442b90ee20368be5d4dd33ec67e1f89872c7
am 040b8559: (-s ours) Import translations. DO NOT MERGE
* commit '040b85595066ff9d3280e3fe4d711542264e6efb':
Import translations. DO NOT MERGE
commit 040b85595066ff9d3280e3fe4d711542264e6efb
Import translations. DO NOT MERGE
commit 9a9367fb6f029640de85cc49825b2eadabc76a00
Import translations. DO NOT MERGE
commit 0f308b47e08552d86c41513a2cd709099158c601
Import translations. DO NOT MERGE
commit 13a1fda4ca87d6ecb818d146fa9f0fb9509be258
Import translations. DO NOT MERGE
commit 12b14d72b457d7f19763f23ec6d0be61c9129ad4
Import translations. DO NOT MERGE
commit 553e079a32db3df26646248b536d2589ba9fea0e
am 57d484c5: (-s ours) am 17f22104: (-s ours) Import translations. DO NOT MERGE
* commit '57d484c5c24532f00e5358e1544c28b20fe564c0':
Import translations. DO NOT MERGE
commit 57d484c5c24532f00e5358e1544c28b20fe564c0
am 17f22104: (-s ours) Import translations. DO NOT MERGE
* commit '17f221043d27d617ceb7f0915c0daace40160946':
Import translations. DO NOT MERGE
commit 17f221043d27d617ceb7f0915c0daace40160946
Import translations. DO NOT MERGE
commit 137e968a49077374b7bf07b1bb3f28eb65b9a95d
Import translations. DO NOT MERGE
commit 88cb67b1a392772ba075549c95d8dafe5c38a6fe
am adacc63c: (-s ours) am dab1a83d: (-s ours) Import translations. DO NOT MERGE
* commit 'adacc63c9af94414c393b51cfc4ce06e8252bab2':
Import translations. DO NOT MERGE
commit adacc63c9af94414c393b51cfc4ce06e8252bab2
am dab1a83d: (-s ours) Import translations. DO NOT MERGE
* commit 'dab1a83db299acd4d80b63ce862d6cd882380017':
Import translations. DO NOT MERGE
commit dab1a83db299acd4d80b63ce862d6cd882380017
Import translations. DO NOT MERGE
commit 7cb3b1241a6c52522530dd64a1469a2025df99ae
Import translations. DO NOT MERGE
commit 9a3a28797dc395179c664f98f4b16fc225e20923
am ebd18059: am 6142a7d8: Merge "Exchange: use the port returned by autodiscover response"
* commit 'ebd1805902eb5565c8ed97dd8067474969f777e2':
Exchange: use the port returned by autodiscover response
commit ebd1805902eb5565c8ed97dd8067474969f777e2
am 6142a7d8: Merge "Exchange: use the port returned by autodiscover response"
* commit '6142a7d8f746b5b7ed7c301e6dcfb5248382a524':
Exchange: use the port returned by autodiscover response
commit 6142a7d8f746b5b7ed7c301e6dcfb5248382a524
Merge "Exchange: use the port returned by autodiscover response"
commit 3860b0c076536883b808c5d865e7e3a509527a69
Exchange: use the port returned by autodiscover response
EAS port could be different than the autodiscover entry point. Just use the returned port
from the autodiscover response.
commit a347433a0307304f714a0ba22b7447afd94ed107
Fix SDK version dependency on Exchange tests.
Exchange builds against 19, so should the tests. This was uncovered
by the removal of apachehttp.
commit 9a0069e612b721ffba80ad07efb6c75273c280f6
Import translations. DO NOT MERGE
commit ea31b9049f1093f5142d2c88fa1110f249b17515
Import translations. DO NOT MERGE
commit c46f307a1dab25fee4cb1eff35dc07cccd271752
Import translations. DO NOT MERGE
commit e8977fddab74b5c6d35e34ebbdbf3b98393dd7c8
am ef7a6de6: (-s ours) am f4d288ef: (-s ours) am c687312a: (-s ours) am 2d64aeb0: (-s ours) Import translations. DO NOT MERGE
* commit 'ef7a6de61279981d1d28b91130eaec8e2d6ba8ad':
Import translations. DO NOT MERGE
commit ef3cfa1aa210f3c41280c4f4a5d3ab2dc4ddb273
am fa394a08: (-s ours) am 7e9bc5a3: (-s ours) am 763dd29b: (-s ours) Import translations. DO NOT MERGE
* commit 'fa394a0874778f0eb30b1ffb387c55f43b5b0c8a':
Import translations. DO NOT MERGE
commit ef7a6de61279981d1d28b91130eaec8e2d6ba8ad
am f4d288ef: (-s ours) am c687312a: (-s ours) am 2d64aeb0: (-s ours) Import translations. DO NOT MERGE
* commit 'f4d288ef77e493dc1266437e8c9e0b53d49d4f0e':
Import translations. DO NOT MERGE
commit fa394a0874778f0eb30b1ffb387c55f43b5b0c8a
am 7e9bc5a3: (-s ours) am 763dd29b: (-s ours) Import translations. DO NOT MERGE
* commit '7e9bc5a375138a23d2bc8ad974680c9e0e0302ab':
Import translations. DO NOT MERGE
commit f4d288ef77e493dc1266437e8c9e0b53d49d4f0e
am c687312a: (-s ours) am 2d64aeb0: (-s ours) Import translations. DO NOT MERGE
* commit 'c687312a075dedd21c1637a102475d3271656eb3':
Import translations. DO NOT MERGE
commit fe20010aa4cc5410f6c9401d168ab37c8582f8c0
am 1fa5fe29: (-s ours) am 9fe9a884: (-s ours) Import translations. DO NOT MERGE
* commit '1fa5fe298b843116baa40060677daa573f975e4a':
Import translations. DO NOT MERGE
commit 7e9bc5a375138a23d2bc8ad974680c9e0e0302ab
am 763dd29b: (-s ours) Import translations. DO NOT MERGE
* commit '763dd29b5025b3ee2bb7a964badf53d642908721':
Import translations. DO NOT MERGE
commit 1fa5fe298b843116baa40060677daa573f975e4a
am 9fe9a884: (-s ours) Import translations. DO NOT MERGE
* commit '9fe9a884d065696e7da836ab8b687eed4fb81361':
Import translations. DO NOT MERGE
commit 4bef81095dbc9cedec8d9db1b58618f2441bd2a3
Import translations. DO NOT MERGE
commit 9fe9a884d065696e7da836ab8b687eed4fb81361
Import translations. DO NOT MERGE
commit 92938fb81fecdb0aea0c8d8296232c1a9f5a8fd1
resolved conflicts for merge of 62c8c8e3 to master
commit 62c8c8e357550f9fba5acffb91092de04c1bfc52
resolved conflicts for merge of faa54a83 to lmp-mr1-dev-plus-aosp
commit 07d0027f332d515d94e1bdf8b97bcaac16dd207a
am 8607b635: am 59edc74a: am 27443729: am a34e767d: am 55fca1c9: Merge "Increment Exchange version" into ub-gmail-ur14-dev
* commit '8607b63586acd16ae4b3166e28a09d2b538f3816':
Increment Exchange version
commit c1e466cc00c292c6c70aa765a152c247295868de
am 0eec4f00: am 146ac38e: am fdeeae28: am e20b0206: am 19ada70d: Add more logging around EAS SmartSend to debug potential issues.
* commit '0eec4f007859f8515f2b2290c4b822622ed402cf':
Add more logging around EAS SmartSend to debug potential issues.
commit b62cd9766b5bbf6ce4d6e127a323924dd3238a4c
am aa0eadcc: am 12a12e7c: am ae796083: am a993369c: am 0ceec56a: Merge "If an account does not support smart forward, then it doesn\'t do smart reply either" into ub-gmail-ur14-dev
* commit 'aa0eadccd1b84ed898ff577dc3d73f1aa5a35f60':
If an account does not support smart forward, then it doesn't do smart reply either
commit 32d507f8f8253c8ec53a1ce8719f1ca707f7ee13
am f3f340da: (-s ours) am 0ab91dff: (-s ours) am 72ce29ff: (-s ours) am 6898763f: (-s ours) am ad9ce7ad: (-s ours) Import translations. DO NOT MERGE
* commit 'f3f340dabc6b5502bc6d9435cf43a8cab7628a34':
Import translations. DO NOT MERGE
commit 0fb4850943492dc450c2a5fd69131a768d73d478
am 5b5ba82c: (-s ours) am 1d43fdb1: (-s ours) am 5eed3f4f: (-s ours) am 1223f944: (-s ours) am 03f9cf8e: (-s ours) Import translations. DO NOT MERGE
* commit '5b5ba82c78b0653753c4763d3da41ff080e9ee23':
Import translations. DO NOT MERGE
commit 43531836bf1980182b05fd66f860ff57f81d0c6f
am 50554946: am 0c93c0f7: am f464ee2a: am 0d60456a: am 71d81d4e: Merge "Add logging so we can see if syncing stops because of security hold" into ub-gmail-ur14-dev
* commit '505549467b1b8b973df4cf3b849d24cfb3d7de6e':
Add logging so we can see if syncing stops because of security hold
commit 0902f60d64236c61f488e8dc798e4acdad6728dc
am 2ef7c529: am a24023c6: am f532dcb9: am 73b4a03d: am e2a23ca4: Merge "Set the sync status upon mailbox creation" into ub-gmail-ur14-dev
* commit '2ef7c5298d6705f10fba6e3d3c27fc77d4355d71':
Set the sync status upon mailbox creation
commit 293c5a09c92c9b339aa61ea039aa3841dad0a69e
am 98b3dd4f: am f300f82c: am f40f956e: am b52c9ba1: am 11a57d16: Remove some debug code
* commit '98b3dd4f6c2bd6784b069478e5c64fead41025c0':
Remove some debug code
commit 70ebdcab703b18f654c0c5e9d6355ccaa91ae9e4
am 8aab9f08: am a74448a8: am 2362f730: am d1d4beb5: am 24c125cd: Merge "If and account can\'t be loaded, do not perform an operation" into ub-gmail-ur14-dev
* commit '8aab9f080eb55836d0e13d7215b75d4c400544f9':
If and account can't be loaded, do not perform an operation
commit cf7de7ef29b4b1597bcb8a6ff88cd0a06e2087fb
am 33678643: (-s ours) am e877ad6e: (-s ours) am d9704227: (-s ours) am f9f0c347: (-s ours) am 6083ed0f: (-s ours) Import translations. DO NOT MERGE
* commit '336786438d509025f66162fc6ffbcf029d47176b':
Import translations. DO NOT MERGE
commit 69eb8e9cf64c143bfb1496f4ffedd03345e82921
am af0995c2: am 47e18a70: am 27a7abda: am a8a1d1ad: am 303a529e: Set the sync_state after search finishes
* commit 'af0995c25374da2467a13a5755b856d801c97031':
Set the sync_state after search finishes
commit 729b6a47f5009eae6db450a50df7390c239b2abe
am 7541103c: am 04872f37: am 72ddda15: am 1f1fcc62: am d9c1848f: Replace "Corporate" by "Exchange"
* commit '7541103c9176a59a872c8b4ab9091bd4737430a3':
Replace "Corporate" by "Exchange"
commit 9c316b3984745c4981fcf64d86053d753152c0d6
am 59b246c1: am 64a3c50a: am 6293202d: am 636339f3: am 47b5e0eb: Update PingSyncSynchronizer logging
* commit '59b246c1ce28895ebd9e6e53e3af07bc4196f69f':
Update PingSyncSynchronizer logging
commit 71470803ac6667a451676e373c4d396f4f7b48a7
am cd5ec6d0: am 20edc7d4: am 0a3ecc56: am a5b9f0f2: am ad1af8af: Fix name fields for selected GAL search results
* commit 'cd5ec6d061c960d00678977963b58c72d9fd25da':
Fix name fields for selected GAL search results
commit d394625b35acfb2c603f92b19ae7d77024d18f0a
am d5856322: am eca451b2: am e4e7aeaa: am 22a157ae: am 1e2a913e: Fix ping upon account creation
* commit 'd58563224233813f6fbf4bbcbef4c5edec33e6d1':
Fix ping upon account creation
commit aae190c7de9ee99a18f3d34b54a2bdd18076546d
am a191144f: am 8c404660: am 0c640182: am a1548d0e: am 9b2db3ef: Merge "Fix a strictmode violoation when starting a delayed ping" into ub-gmail-ur14-dev
* commit 'a191144fda6a5d1e151dfccb4498433749058c98':
Fix a strictmode violoation when starting a delayed ping
commit afeb8c2ebe2c137db547c94c6a44010eb32a0d71
am 8ffbe883: am 468fe55d: am 720815ba: am 59feae0b: am 60900e83: Merge "Enable the automatic hourly ping kick" into ub-gmail-ur14-dev
* commit '8ffbe8835c5263a12149a76457133f5c048884c8':
Enable the automatic hourly ping kick
commit 1c4d775671bfe31907b92aa22647fc22b7d9134c
am d93750b2: (-s ours) am bbc54ac4: (-s ours) am d937812e: (-s ours) am 621c29f7: (-s ours) am 3bea8ee4: (-s ours) Import translations. DO NOT MERGE
* commit 'd93750b2f02610a42cc473f88c83218808b3dbe7':
Import translations. DO NOT MERGE
commit aa8ddf578cc0921e6c3115170f28962a5c7347d4
am 788b3637: am cb576d53: am 10e889a0: am 882cd592: am 065bc58e: Persist debug state in Exchange
* commit '788b363754183c1071c9b440c76f45e8074e45c0':
Persist debug state in Exchange
commit 276fd0b485dc135906d8c593a7b894387a3cc025
am 41bee72c: am 25fc099e: am 72d4b90e: am 3a7ac807: am 40038a7f: Fix search parsing
* commit '41bee72ccf63217bfc78d8e5922640cfc6e9c7dd':
Fix search parsing
commit 94b5191f2ee5fa3dcdf4db97d9215b36395155f2
am b846f084: am ac10dce9: am 4615b6e2: am 92b9d33d: am 00b19ea3: Add more logging to track down b/17708011
* commit 'b846f0844b34065951bd5b339b591852dcb91b40':
Add more logging to track down b/17708011
commit f20f45ebc45fe53448fe57aa01a80dc02ffc1c5b
am 9759bde0: am ac162706: am 4224a45d: am 9a94b7f2: am 6b03f1cc: Build fix
* commit '9759bde0d729beb773500088c2009c415c7dccb9':
Build fix
commit 0407fbdc624df872d23ecf44826044d11b1b2552
am f7026296: am cacf5cab: am ac7c4afd: am a991e025: am 85890d94: Merge "Fix a bug with the delayed ping not being restarted" into ub-gmail-ur14-dev
* commit 'f702629647e7c95973dc43718199d028407fe51c':
Fix a bug with the delayed ping not being restarted
commit 1db5278bbab5c752d477b4356a4045a3c07e004d
am a01e3406: am e7994172: am d6e83ca6: am 854e49b4: am acf68c20: Merge "Add a wtf log if we hit transactionTooLarge with batch size 1" into ub-gmail-ur14-dev
* commit 'a01e34065487af5f46f7d48f5c3ab2c1878f5965':
Add a wtf log if we hit transactionTooLarge with batch size 1
commit 52bedd14a7c7c526fa9692cd6a11891e0a958775
am d992069d: am 45479460: am 48de882b: am d464f217: am 678f86b2: Display sync errors using snackbar and not as a TL footer
* commit 'd992069de221ba4b381ae156490344b8baa2b5d6':
Display sync errors using snackbar and not as a TL footer
commit a617e7ea8ce6eadc5abc240f57ed7dfb3b1b7ff7
am 8bf86ff9: am 21082c2a: am 68da86ba: am 336bc58c: am 457cb325: Merge "When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED" into ub-gmail-ur14-dev
* commit '8bf86ff92c15d4deca7c7985cbc5219b442cb59b':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
commit edc21654cd79dfc2ad7b3ad8c79c2bab5a6e944a
am 2ad80921: (-s ours) am 0da4157b: (-s ours) am 5a246c79: (-s ours) am a7355f69: (-s ours) am d3eec609: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '2ad8092109a3dfeba26efb684d49e62e4689b98a':
Import translations. DO NOT MERGE
commit 1739c38afb8c2be98ed693e351c7896c36cb1821
am 6724f53c: am 02917d7a: am a38fe564: am 5ea266ae: am e23e45c7: Correctly set IS_PRIMARY in CalendarUtilities
* commit '6724f53cbd242b3fbe820115bbd7149c7a67f00e':
Correctly set IS_PRIMARY in CalendarUtilities
commit 708077c59aa30369b3e84c0e5f36967495b337fb
am 8b6fdfbd: am e2b7cb60: am d1d60d5a: am cf438f82: am cce0009a: Don\'t allow disabling the camera with managed profiles
* commit '8b6fdfbd21297440a45bdd99c03e204b7ace9ee7':
Don't allow disabling the camera with managed profiles
commit 104ded64afc1cdea4bc38f970ee67debdb353a0c
am 9484df8d: (-s ours) am e9f56e23: (-s ours) am 7d89215d: (-s ours) am 9a60ae20: (-s ours) am 5ed93a63: (-s ours) Import translations. DO NOT MERGE
* commit '9484df8d82b03cf89b84b2e27c475a78448d81a6':
Import translations. DO NOT MERGE
commit 945cd79db4429760212181b583c621a21a4dea8d
am a3f49987: (-s ours) am dfa119ab: (-s ours) am ac38efbf: (-s ours) am 1cb86259: (-s ours) am d350fcff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'a3f499879cf5f981d1f79245abee3d898c8676fe':
Import translations. DO NOT MERGE
commit 13421a8b8b81ecdd2e8087f89584da321db6125c
am 1afad5ad: (-s ours) am 85ac4674: (-s ours) am 9793f4db: (-s ours) am 69c4e122: (-s ours) am ed99c0e4: (-s ours) am d48f83a5: (-s ours) Import translations. DO NOT MERGE
* commit '1afad5ad9ae275a45c076c54969979576abf3c2a':
Import translations. DO NOT MERGE
commit 38e405bacafdf16296c29cb68aa5f4d421df75d9
am f6340264: am 4f84a135: am 14409d08: am 0da31f0a: am 9d374093: Correctly fix the ping
* commit 'f634026464cbb637fc988eb20d267a7b07edc588':
Correctly fix the ping
commit a83f08fdffcdfff52a9764e82a9e2a1451b9f74a
am 3d090c46: am c1a40fc1: am 7ebe92bd: am 2c47c3f8: am edfecaa5: Fix Exchange pings
* commit '3d090c46e8f10fe9bc9c3f494a6d237e8bd0f2bb':
Fix Exchange pings
commit 32a7aaf1fec9e9bafe531c21bad980f440ee8153
am 50b3b63c: am be9a42fa: am 5dd3ffb5: am 77e34979: am ec787ecb: remove unused resource
* commit '50b3b63cd70850d512eab27b8075009d65bc37cf':
remove unused resource
commit 99e608fc7d63a66faa526416f49fd6d730f34be9
am 1028c83e: (-s ours) am a3e45979: (-s ours) am f7e5c789: (-s ours) am 494cd240: (-s ours) am 93ed9c86: (-s ours) Import translations. DO NOT MERGE
* commit '1028c83e741fe47c3cf9728b232bb18365661165':
Import translations. DO NOT MERGE
commit a00d6c0139c1c2404cbe952de95d4370ffb35390
am c43c0ad8: am dc40ccd4: am 08ad491f: am 0094f581: am 900325bb: Update the Exchange icons
* commit 'c43c0ad806ecfe64508c12fe6c2d991944e516bb':
Update the Exchange icons
commit 8da2ced888d43368953fe7dcdb5b737bd909a15a
am fad08240: am b58edb33: am 27eab0de: am b0cee758: am 3c193c42: Hook up exchange logging to the debug screen
* commit 'fad082409d61ec71fb71c222a7860be8f05c104a':
Hook up exchange logging to the debug screen
commit 3a83429cb201e7754012ed15353209d348d1db70
am a2130c88: am b627b39f: am 7401001e: am f2e380d8: am a099d718: Merge "Some minor code cleanup" into ub-gmail-ur14-dev
* commit 'a2130c889800107d4fd41c3bb9c03d8d3d88bcb1':
Some minor code cleanup
commit bed7d5f4c858286d8b0d2e20d0c925d5d3a53c82
am 6a1e7fc1: am 93b1bb21: am fa076f2c: am 448d8a83: am 3199b845: Put the debug screen back into settings
* commit '6a1e7fc18a3980597d45109ed47c1b2a51327062':
Put the debug screen back into settings
commit 408bc3cbe3ce8676975b385eb4261e8211a494ae
am 1ba41940: am afc27592: am 3eeed7b3: am 5c3400da: am 43124b39: Do not make provider calls with dummy Accounts.
* commit '1ba419405b83caa64c86fdf012906bd7f26570d1':
Do not make provider calls with dummy Accounts.
commit ace1beffdda355acb6ce6044253d1fb6d0038d6e
am 51fe04ad: am d0a9379f: am 7a00dcaf: am e30714ae: am 0219dfc6: b/17045765. Retain folder sync window settings on migration.
* commit '51fe04ad37360254ee3add05b0965d4d5413c4c3':
b/17045765. Retain folder sync window settings on migration.
commit faa54a83d2d488a932115e7370c622cbdff31150
am 90c6294f: am 7d118538: resolved conflicts for merge of 94fc01dc to lmp-sprout-dev
* commit '90c6294fcf74b3b3a6209fd1d08ce54c1e8c651f':
commit 8607b63586acd16ae4b3166e28a09d2b538f3816
am 59edc74a: am 27443729: am a34e767d: am 55fca1c9: Merge "Increment Exchange version" into ub-gmail-ur14-dev
* commit '59edc74a04b28ea268b0f4e858d86eff9dd0c5b2':
Increment Exchange version
commit 0eec4f007859f8515f2b2290c4b822622ed402cf
am 146ac38e: am fdeeae28: am e20b0206: am 19ada70d: Add more logging around EAS SmartSend to debug potential issues.
* commit '146ac38ebc6321966366fc70fb683c6e592742bb':
Add more logging around EAS SmartSend to debug potential issues.
commit aa0eadccd1b84ed898ff577dc3d73f1aa5a35f60
am 12a12e7c: am ae796083: am a993369c: am 0ceec56a: Merge "If an account does not support smart forward, then it doesn\'t do smart reply either" into ub-gmail-ur14-dev
* commit '12a12e7c57a921660ce690b740a5df8f13ac9e0b':
If an account does not support smart forward, then it doesn't do smart reply either
commit f3f340dabc6b5502bc6d9435cf43a8cab7628a34
am 0ab91dff: (-s ours) am 72ce29ff: (-s ours) am 6898763f: (-s ours) am ad9ce7ad: (-s ours) Import translations. DO NOT MERGE
* commit '0ab91dff25bce947f040d75b7b7abdfdca50fbdc':
Import translations. DO NOT MERGE
commit 5b5ba82c78b0653753c4763d3da41ff080e9ee23
am 1d43fdb1: (-s ours) am 5eed3f4f: (-s ours) am 1223f944: (-s ours) am 03f9cf8e: (-s ours) Import translations. DO NOT MERGE
* commit '1d43fdb1243943563f03285dfb0af85cea032828':
Import translations. DO NOT MERGE
commit 505549467b1b8b973df4cf3b849d24cfb3d7de6e
am 0c93c0f7: am f464ee2a: am 0d60456a: am 71d81d4e: Merge "Add logging so we can see if syncing stops because of security hold" into ub-gmail-ur14-dev
* commit '0c93c0f7f447543d96a9acde38a61db7fc9e6463':
Add logging so we can see if syncing stops because of security hold
commit 2ef7c5298d6705f10fba6e3d3c27fc77d4355d71
am a24023c6: am f532dcb9: am 73b4a03d: am e2a23ca4: Merge "Set the sync status upon mailbox creation" into ub-gmail-ur14-dev
* commit 'a24023c678fa1f57130f7b03919f552bcd314f1a':
Set the sync status upon mailbox creation
commit 98b3dd4f6c2bd6784b069478e5c64fead41025c0
am f300f82c: am f40f956e: am b52c9ba1: am 11a57d16: Remove some debug code
* commit 'f300f82cf87d2d5af644f8c9dc0ddf5cb417babb':
Remove some debug code
commit 8aab9f080eb55836d0e13d7215b75d4c400544f9
am a74448a8: am 2362f730: am d1d4beb5: am 24c125cd: Merge "If and account can\'t be loaded, do not perform an operation" into ub-gmail-ur14-dev
* commit 'a74448a8978b56ecc3ff37fedbe02f2b98be7c5c':
If and account can't be loaded, do not perform an operation
commit 336786438d509025f66162fc6ffbcf029d47176b
am e877ad6e: (-s ours) am d9704227: (-s ours) am f9f0c347: (-s ours) am 6083ed0f: (-s ours) Import translations. DO NOT MERGE
* commit 'e877ad6e54ab6121f59b36a9ea851a77bdd4918e':
Import translations. DO NOT MERGE
commit af0995c25374da2467a13a5755b856d801c97031
am 47e18a70: am 27a7abda: am a8a1d1ad: am 303a529e: Set the sync_state after search finishes
* commit '47e18a7089ad9ac86b59433671bb6036faa2bb2e':
Set the sync_state after search finishes
commit 7541103c9176a59a872c8b4ab9091bd4737430a3
am 04872f37: am 72ddda15: am 1f1fcc62: am d9c1848f: Replace "Corporate" by "Exchange"
* commit '04872f37e5402c24bdc41a93bbc856aeeb60043d':
Replace "Corporate" by "Exchange"
commit 59b246c1ce28895ebd9e6e53e3af07bc4196f69f
am 64a3c50a: am 6293202d: am 636339f3: am 47b5e0eb: Update PingSyncSynchronizer logging
* commit '64a3c50a4a6ce950a8763e14bcf8d428a801e224':
Update PingSyncSynchronizer logging
commit cd5ec6d061c960d00678977963b58c72d9fd25da
am 20edc7d4: am 0a3ecc56: am a5b9f0f2: am ad1af8af: Fix name fields for selected GAL search results
* commit '20edc7d4540580a817732f40547c594b0f22a3b8':
Fix name fields for selected GAL search results
commit d58563224233813f6fbf4bbcbef4c5edec33e6d1
am eca451b2: am e4e7aeaa: am 22a157ae: am 1e2a913e: Fix ping upon account creation
* commit 'eca451b2fcf33b58122a647ae44da1c2e78683a1':
Fix ping upon account creation
commit a191144fda6a5d1e151dfccb4498433749058c98
am 8c404660: am 0c640182: am a1548d0e: am 9b2db3ef: Merge "Fix a strictmode violoation when starting a delayed ping" into ub-gmail-ur14-dev
* commit '8c40466053ad382d69ab5b4fdf475aac05907fb5':
Fix a strictmode violoation when starting a delayed ping
commit 8ffbe8835c5263a12149a76457133f5c048884c8
am 468fe55d: am 720815ba: am 59feae0b: am 60900e83: Merge "Enable the automatic hourly ping kick" into ub-gmail-ur14-dev
* commit '468fe55d3e940f0ac89b1ece40b576bf40f016f4':
Enable the automatic hourly ping kick
commit d93750b2f02610a42cc473f88c83218808b3dbe7
am bbc54ac4: (-s ours) am d937812e: (-s ours) am 621c29f7: (-s ours) am 3bea8ee4: (-s ours) Import translations. DO NOT MERGE
* commit 'bbc54ac485d01fafa139dec7563705e8ab0d05df':
Import translations. DO NOT MERGE
commit 788b363754183c1071c9b440c76f45e8074e45c0
am cb576d53: am 10e889a0: am 882cd592: am 065bc58e: Persist debug state in Exchange
* commit 'cb576d5302561e8d6e8441cf974fba9fc0c1b0f0':
Persist debug state in Exchange
commit 41bee72ccf63217bfc78d8e5922640cfc6e9c7dd
am 25fc099e: am 72d4b90e: am 3a7ac807: am 40038a7f: Fix search parsing
* commit '25fc099ecf1e5428295a8aaae0dcb51bff71e124':
Fix search parsing
commit b846f0844b34065951bd5b339b591852dcb91b40
am ac10dce9: am 4615b6e2: am 92b9d33d: am 00b19ea3: Add more logging to track down b/17708011
* commit 'ac10dce92ac73a854e1c876ca039534b115625f9':
Add more logging to track down b/17708011
commit 9759bde0d729beb773500088c2009c415c7dccb9
am ac162706: am 4224a45d: am 9a94b7f2: am 6b03f1cc: Build fix
* commit 'ac162706d333a6d1784e0108de844e4b23e7be4a':
Build fix
commit f702629647e7c95973dc43718199d028407fe51c
am cacf5cab: am ac7c4afd: am a991e025: am 85890d94: Merge "Fix a bug with the delayed ping not being restarted" into ub-gmail-ur14-dev
* commit 'cacf5cabaaea49daf2f59888d2e3ec1b60a59154':
Fix a bug with the delayed ping not being restarted
commit a01e34065487af5f46f7d48f5c3ab2c1878f5965
am e7994172: am d6e83ca6: am 854e49b4: am acf68c20: Merge "Add a wtf log if we hit transactionTooLarge with batch size 1" into ub-gmail-ur14-dev
* commit 'e7994172d935b38312bc98a3a7570f5a6ba4a7ca':
Add a wtf log if we hit transactionTooLarge with batch size 1
commit d992069de221ba4b381ae156490344b8baa2b5d6
am 45479460: am 48de882b: am d464f217: am 678f86b2: Display sync errors using snackbar and not as a TL footer
* commit '4547946014b59305f8fdee5f517a19aad52d4283':
Display sync errors using snackbar and not as a TL footer
commit 8bf86ff92c15d4deca7c7985cbc5219b442cb59b
am 21082c2a: am 68da86ba: am 336bc58c: am 457cb325: Merge "When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED" into ub-gmail-ur14-dev
* commit '21082c2a86bbb81c491f56bfb4aade0e4c50fc22':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
commit 2ad8092109a3dfeba26efb684d49e62e4689b98a
am 0da4157b: (-s ours) am 5a246c79: (-s ours) am a7355f69: (-s ours) am d3eec609: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '0da4157b9a29a4668f3e41c76719a33a530c11a7':
Import translations. DO NOT MERGE
commit 6724f53cbd242b3fbe820115bbd7149c7a67f00e
am 02917d7a: am a38fe564: am 5ea266ae: am e23e45c7: Correctly set IS_PRIMARY in CalendarUtilities
* commit '02917d7a03e951b7f269a3a92917804d93627ee1':
Correctly set IS_PRIMARY in CalendarUtilities
commit 8b6fdfbd21297440a45bdd99c03e204b7ace9ee7
am e2b7cb60: am d1d60d5a: am cf438f82: am cce0009a: Don\'t allow disabling the camera with managed profiles
* commit 'e2b7cb60be279f787ae830ba82c8a86035b99e83':
Don't allow disabling the camera with managed profiles
commit 9484df8d82b03cf89b84b2e27c475a78448d81a6
am e9f56e23: (-s ours) am 7d89215d: (-s ours) am 9a60ae20: (-s ours) am 5ed93a63: (-s ours) Import translations. DO NOT MERGE
* commit 'e9f56e235593418219ecb592e070389760395c1f':
Import translations. DO NOT MERGE
commit a3f499879cf5f981d1f79245abee3d898c8676fe
am dfa119ab: (-s ours) am ac38efbf: (-s ours) am 1cb86259: (-s ours) am d350fcff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'dfa119abc280077f8a08c42a83a09f84f2a421d4':
Import translations. DO NOT MERGE
commit 1afad5ad9ae275a45c076c54969979576abf3c2a
am 85ac4674: (-s ours) am 9793f4db: (-s ours) am 69c4e122: (-s ours) am ed99c0e4: (-s ours) am d48f83a5: (-s ours) Import translations. DO NOT MERGE
* commit '85ac46746c5cb6753c5069600c971dc62b80b8d0':
Import translations. DO NOT MERGE
commit f634026464cbb637fc988eb20d267a7b07edc588
am 4f84a135: am 14409d08: am 0da31f0a: am 9d374093: Correctly fix the ping
* commit '4f84a135a79a5d95e3618353a0a2e73e4a542a92':
Correctly fix the ping
commit 3d090c46e8f10fe9bc9c3f494a6d237e8bd0f2bb
am c1a40fc1: am 7ebe92bd: am 2c47c3f8: am edfecaa5: Fix Exchange pings
* commit 'c1a40fc115eb41e8d70ac00f5466df5a06bdff9b':
Fix Exchange pings
commit 50b3b63cd70850d512eab27b8075009d65bc37cf
am be9a42fa: am 5dd3ffb5: am 77e34979: am ec787ecb: remove unused resource
* commit 'be9a42fab6a6da082a900e6b60281c97a902fb6e':
remove unused resource
commit 1028c83e741fe47c3cf9728b232bb18365661165
am a3e45979: (-s ours) am f7e5c789: (-s ours) am 494cd240: (-s ours) am 93ed9c86: (-s ours) Import translations. DO NOT MERGE
* commit 'a3e45979f49e8d3fc3e0d751eff1f0ec78f34187':
Import translations. DO NOT MERGE
commit c43c0ad806ecfe64508c12fe6c2d991944e516bb
am dc40ccd4: am 08ad491f: am 0094f581: am 900325bb: Update the Exchange icons
* commit 'dc40ccd40f29828fe305b7b869264c6fb17ae515':
Update the Exchange icons
commit fad082409d61ec71fb71c222a7860be8f05c104a
am b58edb33: am 27eab0de: am b0cee758: am 3c193c42: Hook up exchange logging to the debug screen
* commit 'b58edb33e539796c1769d1035cf951c3961b4e2d':
Hook up exchange logging to the debug screen
commit a2130c889800107d4fd41c3bb9c03d8d3d88bcb1
am b627b39f: am 7401001e: am f2e380d8: am a099d718: Merge "Some minor code cleanup" into ub-gmail-ur14-dev
* commit 'b627b39f109dae9d7bc5391c9d50bbc29e12f632':
Some minor code cleanup
commit 6a1e7fc18a3980597d45109ed47c1b2a51327062
am 93b1bb21: am fa076f2c: am 448d8a83: am 3199b845: Put the debug screen back into settings
* commit '93b1bb21ce2803cf9569abf6e032af8c7fb08eb0':
Put the debug screen back into settings
commit 1ba419405b83caa64c86fdf012906bd7f26570d1
am afc27592: am 3eeed7b3: am 5c3400da: am 43124b39: Do not make provider calls with dummy Accounts.
* commit 'afc27592f7402a7bd68f2b2817852a6b2cb277e4':
Do not make provider calls with dummy Accounts.
commit 51fe04ad37360254ee3add05b0965d4d5413c4c3
am d0a9379f: am 7a00dcaf: am e30714ae: am 0219dfc6: b/17045765. Retain folder sync window settings on migration.
* commit 'd0a9379fb8f839aff941ca226f7a10c1ae01f7a1':
b/17045765. Retain folder sync window settings on migration.
commit 59edc74a04b28ea268b0f4e858d86eff9dd0c5b2
am 27443729: am a34e767d: am 55fca1c9: Merge "Increment Exchange version" into ub-gmail-ur14-dev
* commit '27443729570e82e296667b7c643410d08f07245d':
Increment Exchange version
commit 146ac38ebc6321966366fc70fb683c6e592742bb
am fdeeae28: am e20b0206: am 19ada70d: Add more logging around EAS SmartSend to debug potential issues.
* commit 'fdeeae28803e2d11aaa3add49a936efbc7a2e5e6':
Add more logging around EAS SmartSend to debug potential issues.
commit 12a12e7c57a921660ce690b740a5df8f13ac9e0b
am ae796083: am a993369c: am 0ceec56a: Merge "If an account does not support smart forward, then it doesn\'t do smart reply either" into ub-gmail-ur14-dev
* commit 'ae796083dd453dbc2e7fecf11c18136d47fd789f':
If an account does not support smart forward, then it doesn't do smart reply either
commit 0ab91dff25bce947f040d75b7b7abdfdca50fbdc
am 72ce29ff: (-s ours) am 6898763f: (-s ours) am ad9ce7ad: (-s ours) Import translations. DO NOT MERGE
* commit '72ce29ffd550bb5b9ebbc8e5afff6a25c286785d':
Import translations. DO NOT MERGE
commit 1d43fdb1243943563f03285dfb0af85cea032828
am 5eed3f4f: (-s ours) am 1223f944: (-s ours) am 03f9cf8e: (-s ours) Import translations. DO NOT MERGE
* commit '5eed3f4f1d268bb22cfd03d682445fe88d35e999':
Import translations. DO NOT MERGE
commit 0c93c0f7f447543d96a9acde38a61db7fc9e6463
am f464ee2a: am 0d60456a: am 71d81d4e: Merge "Add logging so we can see if syncing stops because of security hold" into ub-gmail-ur14-dev
* commit 'f464ee2a0bc6fff5f5eee3ef3efb3e48c1344da3':
Add logging so we can see if syncing stops because of security hold
commit a24023c678fa1f57130f7b03919f552bcd314f1a
am f532dcb9: am 73b4a03d: am e2a23ca4: Merge "Set the sync status upon mailbox creation" into ub-gmail-ur14-dev
* commit 'f532dcb90a644da22ebb7d59a19782cf0c276fcb':
Set the sync status upon mailbox creation
commit f300f82cf87d2d5af644f8c9dc0ddf5cb417babb
am f40f956e: am b52c9ba1: am 11a57d16: Remove some debug code
* commit 'f40f956e0868bb718250f69a439c12a8e7599b2c':
Remove some debug code
commit a74448a8978b56ecc3ff37fedbe02f2b98be7c5c
am 2362f730: am d1d4beb5: am 24c125cd: Merge "If and account can\'t be loaded, do not perform an operation" into ub-gmail-ur14-dev
* commit '2362f730c8e15dec39a5c560c29e8115264da792':
If and account can't be loaded, do not perform an operation
commit e877ad6e54ab6121f59b36a9ea851a77bdd4918e
am d9704227: (-s ours) am f9f0c347: (-s ours) am 6083ed0f: (-s ours) Import translations. DO NOT MERGE
* commit 'd97042274d52a20538e5e131396d607698d87340':
Import translations. DO NOT MERGE
commit 47e18a7089ad9ac86b59433671bb6036faa2bb2e
am 27a7abda: am a8a1d1ad: am 303a529e: Set the sync_state after search finishes
* commit '27a7abda4743268c2ac55089bd25c52beecd9ff0':
Set the sync_state after search finishes
commit 04872f37e5402c24bdc41a93bbc856aeeb60043d
am 72ddda15: am 1f1fcc62: am d9c1848f: Replace "Corporate" by "Exchange"
* commit '72ddda158704e24992a84be32ad4480433ce017a':
Replace "Corporate" by "Exchange"
commit 64a3c50a4a6ce950a8763e14bcf8d428a801e224
am 6293202d: am 636339f3: am 47b5e0eb: Update PingSyncSynchronizer logging
* commit '6293202d62d57b838b710fd0d439b325f55f3443':
Update PingSyncSynchronizer logging
commit 20edc7d4540580a817732f40547c594b0f22a3b8
am 0a3ecc56: am a5b9f0f2: am ad1af8af: Fix name fields for selected GAL search results
* commit '0a3ecc562f089b518ee75c9d1f5c3f9690dd7c07':
Fix name fields for selected GAL search results
commit eca451b2fcf33b58122a647ae44da1c2e78683a1
am e4e7aeaa: am 22a157ae: am 1e2a913e: Fix ping upon account creation
* commit 'e4e7aeaaca2cf246f75b612f2f5039997ba8c0e5':
Fix ping upon account creation
commit 8c40466053ad382d69ab5b4fdf475aac05907fb5
am 0c640182: am a1548d0e: am 9b2db3ef: Merge "Fix a strictmode violoation when starting a delayed ping" into ub-gmail-ur14-dev
* commit '0c640182a0fdae9f6a8f7948792c44bd937a8744':
Fix a strictmode violoation when starting a delayed ping
commit 468fe55d3e940f0ac89b1ece40b576bf40f016f4
am 720815ba: am 59feae0b: am 60900e83: Merge "Enable the automatic hourly ping kick" into ub-gmail-ur14-dev
* commit '720815baf5b3520d782c7f753145c4626ca45d77':
Enable the automatic hourly ping kick
commit bbc54ac485d01fafa139dec7563705e8ab0d05df
am d937812e: (-s ours) am 621c29f7: (-s ours) am 3bea8ee4: (-s ours) Import translations. DO NOT MERGE
* commit 'd937812ed074f1cfed569c258dbaa60482b0a0c6':
Import translations. DO NOT MERGE
commit cb576d5302561e8d6e8441cf974fba9fc0c1b0f0
am 10e889a0: am 882cd592: am 065bc58e: Persist debug state in Exchange
* commit '10e889a05667c13bf175864757e8ef76ff3b4a6f':
Persist debug state in Exchange
commit 25fc099ecf1e5428295a8aaae0dcb51bff71e124
am 72d4b90e: am 3a7ac807: am 40038a7f: Fix search parsing
* commit '72d4b90ea027b11dabd1ed46d3d17df9e30090d5':
Fix search parsing
commit ac10dce92ac73a854e1c876ca039534b115625f9
am 4615b6e2: am 92b9d33d: am 00b19ea3: Add more logging to track down b/17708011
* commit '4615b6e2ab633fe97537141b71c66c1c3d43bf49':
Add more logging to track down b/17708011
commit ac162706d333a6d1784e0108de844e4b23e7be4a
am 4224a45d: am 9a94b7f2: am 6b03f1cc: Build fix
* commit '4224a45d482d74a3d5a1f3e5ec4ff0530fc0f914':
Build fix
commit cacf5cabaaea49daf2f59888d2e3ec1b60a59154
am ac7c4afd: am a991e025: am 85890d94: Merge "Fix a bug with the delayed ping not being restarted" into ub-gmail-ur14-dev
* commit 'ac7c4afd3ef3d4e9291beb8f5f45736fabc3251b':
Fix a bug with the delayed ping not being restarted
commit e7994172d935b38312bc98a3a7570f5a6ba4a7ca
am d6e83ca6: am 854e49b4: am acf68c20: Merge "Add a wtf log if we hit transactionTooLarge with batch size 1" into ub-gmail-ur14-dev
* commit 'd6e83ca62cba3fb2539b5abf31bfe557117b7995':
Add a wtf log if we hit transactionTooLarge with batch size 1
commit 4547946014b59305f8fdee5f517a19aad52d4283
am 48de882b: am d464f217: am 678f86b2: Display sync errors using snackbar and not as a TL footer
* commit '48de882bcb92cfbd6d6a4c57bc8e65c50b93a7c6':
Display sync errors using snackbar and not as a TL footer
commit 21082c2a86bbb81c491f56bfb4aade0e4c50fc22
am 68da86ba: am 336bc58c: am 457cb325: Merge "When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED" into ub-gmail-ur14-dev
* commit '68da86baa89c27a44d6abc25de6c12912bd270f9':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
commit 0da4157b9a29a4668f3e41c76719a33a530c11a7
am 5a246c79: (-s ours) am a7355f69: (-s ours) am d3eec609: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '5a246c7963d2be80ecaf6785ea71e1568d3e26ee':
Import translations. DO NOT MERGE
commit 02917d7a03e951b7f269a3a92917804d93627ee1
am a38fe564: am 5ea266ae: am e23e45c7: Correctly set IS_PRIMARY in CalendarUtilities
* commit 'a38fe564e1b6345093fe7711888d54e8da1aa773':
Correctly set IS_PRIMARY in CalendarUtilities
commit e2b7cb60be279f787ae830ba82c8a86035b99e83
am d1d60d5a: am cf438f82: am cce0009a: Don\'t allow disabling the camera with managed profiles
* commit 'd1d60d5a1a86808b632b3ac950d54f8660c4e22c':
Don't allow disabling the camera with managed profiles
commit e9f56e235593418219ecb592e070389760395c1f
am 7d89215d: (-s ours) am 9a60ae20: (-s ours) am 5ed93a63: (-s ours) Import translations. DO NOT MERGE
* commit '7d89215d1873dca6cb2b6c8e1881a1e7d70b3f05':
Import translations. DO NOT MERGE
commit dfa119abc280077f8a08c42a83a09f84f2a421d4
am ac38efbf: (-s ours) am 1cb86259: (-s ours) am d350fcff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'ac38efbf2fad1b81ed357f6a424ec2b522f7e8ad':
Import translations. DO NOT MERGE
commit 85ac46746c5cb6753c5069600c971dc62b80b8d0
am 9793f4db: (-s ours) am 69c4e122: (-s ours) am ed99c0e4: (-s ours) am d48f83a5: (-s ours) Import translations. DO NOT MERGE
* commit '9793f4db462e84bfab260738d9391bbb5eb90eda':
Import translations. DO NOT MERGE
commit 4f84a135a79a5d95e3618353a0a2e73e4a542a92
am 14409d08: am 0da31f0a: am 9d374093: Correctly fix the ping
* commit '14409d08d1544872e00512f207aceadc6666f1b3':
Correctly fix the ping
commit c1a40fc115eb41e8d70ac00f5466df5a06bdff9b
am 7ebe92bd: am 2c47c3f8: am edfecaa5: Fix Exchange pings
* commit '7ebe92bd6a21eebe94cf4f7d18a018cba7565925':
Fix Exchange pings
commit be9a42fab6a6da082a900e6b60281c97a902fb6e
am 5dd3ffb5: am 77e34979: am ec787ecb: remove unused resource
* commit '5dd3ffb518866517846bcad111793f73e10f6ed6':
remove unused resource
commit a3e45979f49e8d3fc3e0d751eff1f0ec78f34187
am f7e5c789: (-s ours) am 494cd240: (-s ours) am 93ed9c86: (-s ours) Import translations. DO NOT MERGE
* commit 'f7e5c78938fcc8d7ee57e1be6411ea2a65af8c1b':
Import translations. DO NOT MERGE
commit dc40ccd40f29828fe305b7b869264c6fb17ae515
am 08ad491f: am 0094f581: am 900325bb: Update the Exchange icons
* commit '08ad491ff3c825f5acbc3ac0630f9137a5264786':
Update the Exchange icons
commit b58edb33e539796c1769d1035cf951c3961b4e2d
am 27eab0de: am b0cee758: am 3c193c42: Hook up exchange logging to the debug screen
* commit '27eab0dee42d1d12f1ac8d045846e62b9fa928d5':
Hook up exchange logging to the debug screen
commit b627b39f109dae9d7bc5391c9d50bbc29e12f632
am 7401001e: am f2e380d8: am a099d718: Merge "Some minor code cleanup" into ub-gmail-ur14-dev
* commit '7401001ed2569944e33ebf95f0546c69c386bf84':
Some minor code cleanup
commit 93b1bb21ce2803cf9569abf6e032af8c7fb08eb0
am fa076f2c: am 448d8a83: am 3199b845: Put the debug screen back into settings
* commit 'fa076f2c4c1f38f3a03148e319923f0ba46723e1':
Put the debug screen back into settings
commit afc27592f7402a7bd68f2b2817852a6b2cb277e4
am 3eeed7b3: am 5c3400da: am 43124b39: Do not make provider calls with dummy Accounts.
* commit '3eeed7b3742f2947f488d544f6909930fadffe1e':
Do not make provider calls with dummy Accounts.
commit d0a9379fb8f839aff941ca226f7a10c1ae01f7a1
am 7a00dcaf: am e30714ae: am 0219dfc6: b/17045765. Retain folder sync window settings on migration.
* commit '7a00dcafd9cb961b726d3da896b76a5d594bc961':
b/17045765. Retain folder sync window settings on migration.
commit 5dfe0c447395f3e0d6d8506ba9ccb4dd232c5885
am a4ebd9be: (-s ours) am 7766cd43: (-s ours) Import translations. DO NOT MERGE
* commit 'a4ebd9becfd9fea3b8265b611e75c9e43f13a5c7':
Import translations. DO NOT MERGE
commit a4ebd9becfd9fea3b8265b611e75c9e43f13a5c7
am 7766cd43: (-s ours) Import translations. DO NOT MERGE
* commit '7766cd438bf2ec7aa113b9d9e1a35fa94926ea54':
Import translations. DO NOT MERGE
commit 7766cd438bf2ec7aa113b9d9e1a35fa94926ea54
Import translations. DO NOT MERGE
commit f5c0f95e8bdead7c5c830376fa7100ece8606daf
am 8bdc6032: (-s ours) am a12ef2a6: (-s ours) am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit '8bdc603200394da4f7e6c2ff4a3f73b1b8371ee9':
commit f7ea820c387d84075cb19ae6135e51b31011e778
am 84844a6a: (-s ours) am 7677997a: (-s ours) am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '84844a6a3f3c7df88d37ea29896567fcfa23afc4':
commit 8bdc603200394da4f7e6c2ff4a3f73b1b8371ee9
am a12ef2a6: (-s ours) am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit 'a12ef2a63a2a28d06b9d1bc8cdebfb9f18ea4ccd':
commit 84844a6a3f3c7df88d37ea29896567fcfa23afc4
am 7677997a: (-s ours) am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '7677997aa4c62e349b5346bfbc9956c95577ae64':
commit cdd55d400ebd6a4bcdf24a61a3553dd0aa0ba1a9
Import translations. DO NOT MERGE
commit 461341ba62256d9f72a5207052ff8e584379b2ed
am 56462913: (-s ours) am cc1cea42: (-s ours) am 556a1b9b: (-s ours) am 2eb7c2cc: (-s ours) am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit '56462913b14600418908fcf0d37f8a5338cacb14':
Import translations. DO NOT MERGE
commit 56462913b14600418908fcf0d37f8a5338cacb14
am cc1cea42: (-s ours) am 556a1b9b: (-s ours) am 2eb7c2cc: (-s ours) am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit 'cc1cea4209f05f2d86cead7946127bc8c7498405':
Import translations. DO NOT MERGE
commit cc1cea4209f05f2d86cead7946127bc8c7498405
am 556a1b9b: (-s ours) am 2eb7c2cc: (-s ours) am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit '556a1b9b8aba8a0f7a8d194e9ade1ddf818ebab0':
Import translations. DO NOT MERGE
commit a12ef2a63a2a28d06b9d1bc8cdebfb9f18ea4ccd
am b3470255: (-s ours) Import translations. DO NOT MERGE
* commit 'b34702557068ad30be2271cbac510e249da65426':
Import translations. DO NOT MERGE
commit 26b8f8fc3a96715297540f9fa01512511b4497b7
Import translations. DO NOT MERGE
commit b3c668a8a8630e99fb4bf208bfac62d7b89360b9
Import translations. DO NOT MERGE
commit 1a0153fa3eb4aedeab4bc59fb5eb1dcee835fcd6
am 2a6a2e0d: (-s ours) am 9e046482: (-s ours) am 760f2841: (-s ours) am 127fd3cf: (-s ours) am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '2a6a2e0df2755167b538488df39bdd0fa3c8e059':
Import translations. DO NOT MERGE
commit 2a6a2e0df2755167b538488df39bdd0fa3c8e059
am 9e046482: (-s ours) am 760f2841: (-s ours) am 127fd3cf: (-s ours) am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '9e046482b28ac4de978148c403a9264c559d5933':
Import translations. DO NOT MERGE
commit 9e046482b28ac4de978148c403a9264c559d5933
am 760f2841: (-s ours) am 127fd3cf: (-s ours) am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '760f284105222e72c8a908b7793ae0aa74b65fdc':
Import translations. DO NOT MERGE
commit 7677997aa4c62e349b5346bfbc9956c95577ae64
am 02e52bdc: (-s ours) Import translations. DO NOT MERGE
* commit '02e52bdcd999286e4d93effad4fae3b9e5e75cdb':
Import translations. DO NOT MERGE
commit d567353c76b27f46c24c56cd398e05ddc8a45d95
Import translations. DO NOT MERGE
commit e486fe0f7310111292d86f8307cb78cb1afe2ed8
Import translations. DO NOT MERGE
commit c5309fa532ba2da75936b5a4eb7e79a771b5ae24
am b214eecb: (-s ours) am ab683df7: (-s ours) am f862a498: (-s ours) am f289d52b: (-s ours) am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit 'b214eecb5ca30566e8c36f5466b9cd7505bcb489':
commit b214eecb5ca30566e8c36f5466b9cd7505bcb489
am ab683df7: (-s ours) am f862a498: (-s ours) am f289d52b: (-s ours) am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit 'ab683df7efae707130580bf2de8194ed535027ca':
commit 3f1086b4cad8ea6dc130a101827665092fce5bd9
Import translations. DO NOT MERGE
commit ab683df7efae707130580bf2de8194ed535027ca
am f862a498: (-s ours) am f289d52b: (-s ours) am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit 'f862a4983be68ccc176663ea554d300d39908d27':
Import translations. DO NOT MERGE
commit 560ea0d609fb74b9a9d7118fe2b6b6a2ee13fa38
am c12a7c0d: (-s ours) am 09206ec2: (-s ours) am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit 'c12a7c0d1a866e7a58b1edbe74e6981adef7973f':
Import translations. DO NOT MERGE
commit c12a7c0d1a866e7a58b1edbe74e6981adef7973f
am 09206ec2: (-s ours) am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit '09206ec21d8d4127f3bb2fa567504a2be49aba24':
Import translations. DO NOT MERGE
commit 09206ec21d8d4127f3bb2fa567504a2be49aba24
am fc680517: (-s ours) Import translations. DO NOT MERGE
* commit 'fc680517c5890266bf8cbb2eb5d52bb79616ca06':
Import translations. DO NOT MERGE
commit a013320116d183373a29545ffae71fa7287eb265
Import translations. DO NOT MERGE
commit 12498b58e5ff69fb9655f3fb17e0c5b2d09fe366
am 3eba699d: (-s ours) am 21beb8b8: (-s ours) am 050cbb28: (-s ours) am 835f3b1a: (-s ours) am 3a9b1b53: (-s ours) Import translations. DO NOT MERGE
* commit '3eba699d7a61ba3bd81cc2cfee75cd008d776dcd':
Import translations. DO NOT MERGE
commit 3eba699d7a61ba3bd81cc2cfee75cd008d776dcd
am 21beb8b8: (-s ours) am 050cbb28: (-s ours) am 835f3b1a: (-s ours) am 3a9b1b53: (-s ours) Import translations. DO NOT MERGE
* commit '21beb8b823def147eb79b4d5dafb11f194deba4c':
Import translations. DO NOT MERGE
commit 21beb8b823def147eb79b4d5dafb11f194deba4c
am 050cbb28: (-s ours) am 835f3b1a: (-s ours) am 3a9b1b53: (-s ours) Import translations. DO NOT MERGE
* commit '050cbb2845cdb3b93f57dfd48d110487f5adc2f6':
Import translations. DO NOT MERGE
commit 12c1e72aa4ab07c81f9fa4a8d07b6e4d3bf5ddb3
am 48dab908: (-s ours) am db4374db: (-s ours) am a7ef8db3: (-s ours) Import translations. DO NOT MERGE
* commit '48dab9082cbbe92db937e7643a9a15f6fb19cd50':
Import translations. DO NOT MERGE
commit 48dab9082cbbe92db937e7643a9a15f6fb19cd50
am db4374db: (-s ours) am a7ef8db3: (-s ours) Import translations. DO NOT MERGE
* commit 'db4374db1b0cedffbc2a60a5ffdd28528ac4d93a':
Import translations. DO NOT MERGE
commit db4374db1b0cedffbc2a60a5ffdd28528ac4d93a
am a7ef8db3: (-s ours) Import translations. DO NOT MERGE
* commit 'a7ef8db366209ee406ad476f2dcedbe221638365':
Import translations. DO NOT MERGE
commit 056221b26d85f4ecbaf3ec118f716c327217bbd0
am 56c0469e: am 0e9ddb69: am 9cfceb29: reset to ub-mail-master-release at f2dd61b
* commit '56c0469e7cae6d3e583246d92947ed059871663f':
commit 707abae19d8cb0b8834b1f638355fa7ac13aaf2d
am 6ab297d8: am 308dd2f5: reset to sha1 f2dd61b with history
* commit '6ab297d82b75d7e0763f951e0680087ee963f569':
commit 56c0469e7cae6d3e583246d92947ed059871663f
am 0e9ddb69: am 9cfceb29: reset to ub-mail-master-release at f2dd61b
* commit '0e9ddb69984d8e038a063f9216d9de2eb87fb3f6':
commit 6ab297d82b75d7e0763f951e0680087ee963f569
am 308dd2f5: reset to sha1 f2dd61b with history
* commit '308dd2f56ea179ad1647bf20eed7a015abbf6d1e':
commit 7dfe707230dea7b1e1ae8627ffa54b92e87df325
am 5d3ca5c0: reset to f2dd61b with history
* commit '5d3ca5c013b480bdb05198023f680d69957f965b':
commit 3853e29b91aca1036e8510ae067f6d788cdd64ac
reset to f2dd61b with history
commit 5d3ca5c013b480bdb05198023f680d69957f965b
reset to f2dd61b with history
commit 0e9ddb69984d8e038a063f9216d9de2eb87fb3f6
am 9cfceb29: reset to ub-mail-master-release at f2dd61b
* commit '9cfceb29c296631eec820cbce4f160302a8234ea':
commit 308dd2f56ea179ad1647bf20eed7a015abbf6d1e
reset to sha1 f2dd61b with history
commit 73663218b19c6a73651ab81a598c885ad74bef33
am 08333285: (-s ours) am b997359f: (-s ours) am e528a93a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '08333285ab9637ee949200c82ca5f07a1dad744b':
Import translations. DO NOT MERGE
commit 08333285ab9637ee949200c82ca5f07a1dad744b
am b997359f: (-s ours) am e528a93a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b997359fab0ade96032dc3be7cab6076e5b399db':
Import translations. DO NOT MERGE
commit b997359fab0ade96032dc3be7cab6076e5b399db
am e528a93a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e528a93a8e00b859bac1b67c637fc83558bce6ba':
Import translations. DO NOT MERGE
commit 935bea06f0465b2b6dd8df06d32e5300938afb9f
am eacb5e28: (-s ours) am 5aa996cb: (-s ours) am e21f3cf2: (-s ours) am 18ab90d4: (-s ours) am 1c546b73: (-s ours) Import translations. DO NOT MERGE
* commit 'eacb5e2820c409c850098c917fe35299695ac06f':
Import translations. DO NOT MERGE
commit eacb5e2820c409c850098c917fe35299695ac06f
am 5aa996cb: (-s ours) am e21f3cf2: (-s ours) am 18ab90d4: (-s ours) am 1c546b73: (-s ours) Import translations. DO NOT MERGE
* commit '5aa996cb25878bfb5ccdd2336fd2cad17092c240':
Import translations. DO NOT MERGE
commit 5aa996cb25878bfb5ccdd2336fd2cad17092c240
am e21f3cf2: (-s ours) am 18ab90d4: (-s ours) am 1c546b73: (-s ours) Import translations. DO NOT MERGE
* commit 'e21f3cf2baea7d9f6e94f4ca2dd9c80c5dabb93d':
Import translations. DO NOT MERGE
commit 0c7cbb86401e8bd7a3f1157c46880e77a5308627
Import translations. DO NOT MERGE
commit f971c00ac00a47f30b12cc4005d283107b651795
Import translations. DO NOT MERGE
commit 82d500c17740bb23abd0084988217f347f4e8811
am 975a3850: am e14552f1: am fc27c514: keep history after reset to ub-mail-master-release
* commit '975a385075fe52f8612bee65b1f73c3b51a6030f':
commit 6035d9d8a0aca94fdfe16a66b62f4dfc6a416931
am 6937eef0: am a9e8af40: am 8c1dc7fc: merge in ub-mail-master-release history after reset to 03735a839ba61710f887fffd6d3f605c0b127c2e
* commit '6937eef0302b462a48161500dd9bce60accc610b':
Remove deprecated locales
commit 17b6c35f188052d5fd7156a115405fdc9005ab68
am 87825238: am b91309c5: am 03735a83: Improve Exchange AutoDiscover
* commit '87825238cef300b03c22dbaa57caae5851d61950':
Improve Exchange AutoDiscover
commit 7fb61055ebead48e4aeedb36fa109cf2957a127d
am 9b930806: (-s ours) am 5d632877: (-s ours) am dabb771e: (-s ours) Import translations. DO NOT MERGE
* commit '9b9308069bdc7f171832a3b4e8f973680acd9d52':
Import translations. DO NOT MERGE
commit de390636588c9a9cdc1d825943b36526ceab2dc1
am 530305c1: (-s ours) am 5224195b: am 790d80ea: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '530305c10166b27bb0b804912c767305ef889407':
Remove deprecated locales - DO NOT MERGE
commit 636a96eda1852f44110e89e9a4141a78d25b7d36
am c2cb767f: (-s ours) am a284202d: (-s ours) am 1e486240: (-s ours) Import translations. DO NOT MERGE
* commit 'c2cb767fb82033d3d0c0c3918547a9cd0132150f':
Import translations. DO NOT MERGE
commit 8d1a631ebdac8f4a7915c2fc24d9373461b6004d
am 17edc5af: (-s ours) am c11ff1e7: am 1cee1db9: keep history after reset to ub-mail-master-release
* commit '17edc5afc8c174c38b6aad0118ae48dca67d0423':
commit b100b8e8991f273d93da2c89ed3ee34bb520a37b
am 2f0701ee: am ed032914: am db678bad: Update IEmailService
* commit '2f0701eeee4b7ee904a1c45af1589dfd10d27daa':
commit 6b8919633ebd9db5fefcc57e64a92782b24003d9
am 6b8929d8: am 6bd6150d: am d793a087: Add communication class for HostAuth
* commit '6b8929d88901a7315197ece6929e4c99f35ace12':
commit 9ea8f2336bcfe0adec31698efbc5e4b3dbda0bda
am aab5308e: (-s ours) am a085db17: (-s ours) am 0f40c9f1: (-s ours) am 54c79998: (-s ours) Import translations. DO NOT MERGE
* commit 'aab5308e3ecfec8ca80fc686a951dd6df478ea2a':
commit ac1aa5c2f362d37a4879f97143632f9c38295f26
am c8931eb9: (-s ours) am 845d96aa: (-s ours) am 68dbea47: (-s ours) am fc76e00e: (-s ours) Import translations. DO NOT MERGE
* commit 'c8931eb9f3a1290c23cd4570125acf11ad8182ea':
commit 273a0a69880f2f106513b8f6709db7f181e407d2
am 79001b6e: (-s ours) am 037c538d: (-s ours) am eee653bb: (-s ours) am 3b8a8d66: (-s ours) Import translations. DO NOT MERGE
* commit '79001b6e3ee7b6bd31f19e21aa01b858e2d593af':
commit 6d317baaa6bfab19e4c0689d01e6aa8c0511e9d9
am 5715f64f: (-s ours) am 453a4d30: (-s ours) am c6385cda: (-s ours) Import translations. DO NOT MERGE
* commit '5715f64fc37cb9085da60f713c5ef07e3289053a':
commit a88f8e26298eb2b741586f8c7dda1bc35627ddfb
am 9444ca00: am 5c115ae2: Add uses-sdk to test apk
* commit '9444ca00c79d52cda5427da5282e2a271f5bf0fb':
commit 53fcf9709dcba1ed418f54aea2488c15c102fe1c
am 2d85d93d: am 4e7c2380: Merge "Make Calendar and Contacts syncing go through EasService" into ub-mail-master
* commit '2d85d93d754d5fab8efec2ed634e78e3c8ce4273':
commit 47f8e267ee59a4a534f1ae278f5d87a332b721bb
am 7c0b84ea: am 490bf9fb: Delete obsolete emailsync code
* commit '7c0b84eaa7001b7c43d63a1f120140168e6d4906':
commit 7c8b56e4f594d0fb868de648e0585a330d466662
am 3c9df18a: am e04c59dd: Make sure that we restart the ping when we have an EasService.
* commit '3c9df18aa1b2ebec73b9be19703d41114fdcfeef':
commit 36cc00750383ace1e320d957dc571b041d04af9b
am 21eef789: am ad6c0d3b: Merge "Make sure that we have an EasService in onPerformSync" into ub-mail-master
* commit '21eef78992861f661e6c28b77316dd606bd8dfae':
commit 9d48c890a3989ea113f3681c48ec330753b110d1
am 5115c768: am 31f1c78d: Start push pings on startup
* commit '5115c768018087f6ecc2e9e01311d83554f58137':
commit 12a775d6e45162789886551cdded53e0f34f4157
am 5249e26b: am 2db0b681: b/15746597. Adjust workflow when there are no results for a GAL search.
* commit '5249e26b895a4087706c884a9199099258e0d0f6':
commit 3c74241c108d3c32bb9af501ae3dcc09e2bb0f75
am 1728bbe4: am 59e87fab: Merge "Fix NPE when mPolicy is unset" into ub-mail-master
* commit '1728bbe4ea779e25b197ab6f7214c2782c07560c':
commit 1ae7eb2414648d04bee0de4b463ae698b01affba
am 79831b9c: am f5952f93: b/15742016. Fix up some error logging.
* commit '79831b9c602a0d8d5097cd23d39f93bf6c55623b':
commit a9edf27d28b1135686baa065bb61d0975fb012f3
am a69cc0e2: resolved conflicts for merge of 61ebb38e to lmp-ub-dev
* commit 'a69cc0e2a1b9d27e3d9b1940b68d8c77ad7b2f2b':
commit 975a385075fe52f8612bee65b1f73c3b51a6030f
am e14552f1: am fc27c514: keep history after reset to ub-mail-master-release
* commit 'e14552f14a805c2ffaeb982f858f9f8b9b106ea9':
commit 6937eef0302b462a48161500dd9bce60accc610b
am a9e8af40: am 8c1dc7fc: merge in ub-mail-master-release history after reset to 03735a839ba61710f887fffd6d3f605c0b127c2e
* commit 'a9e8af405cf4e467c557bbca6ba2aeb181d13b32':
Remove deprecated locales
commit 87825238cef300b03c22dbaa57caae5851d61950
am b91309c5: am 03735a83: Improve Exchange AutoDiscover
* commit 'b91309c52ca1ab10bcc32ad72661d9fbb6cc3b6c':
Improve Exchange AutoDiscover
commit e14552f14a805c2ffaeb982f858f9f8b9b106ea9
am fc27c514: keep history after reset to ub-mail-master-release
* commit 'fc27c5145ecc887a2787db62db7e93bb13de6cf2':
commit a9e8af405cf4e467c557bbca6ba2aeb181d13b32
am 8c1dc7fc: merge in ub-mail-master-release history after reset to 03735a839ba61710f887fffd6d3f605c0b127c2e
* commit '8c1dc7fcd934c7f161ff0f498d779295f365b82a':
Remove deprecated locales
commit b91309c52ca1ab10bcc32ad72661d9fbb6cc3b6c
am 03735a83: Improve Exchange AutoDiscover
* commit '03735a839ba61710f887fffd6d3f605c0b127c2e':
Improve Exchange AutoDiscover
commit 8153290e4d468e9b781fe29eed86e7d2ce0f08c1
Import translations. DO NOT MERGE
commit 897ae325b829cb1ca505a1680370ffb66bbc44d2
Import translations. DO NOT MERGE
commit 9b9308069bdc7f171832a3b4e8f973680acd9d52
am 5d632877: (-s ours) am dabb771e: (-s ours) Import translations. DO NOT MERGE
* commit '5d63287759b1f3b5fbf70958177d1c666e8b1f08':
Import translations. DO NOT MERGE
commit 5d63287759b1f3b5fbf70958177d1c666e8b1f08
am dabb771e: (-s ours) Import translations. DO NOT MERGE
* commit 'dabb771ef86de47cd2868f4da4facbdbfe512679':
Import translations. DO NOT MERGE
commit 530305c10166b27bb0b804912c767305ef889407
am 5224195b: am 790d80ea: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '5224195bd72e0ad6ecf47d06c92be761a3eae719':
Remove deprecated locales - DO NOT MERGE
commit c2cb767fb82033d3d0c0c3918547a9cd0132150f
am a284202d: (-s ours) am 1e486240: (-s ours) Import translations. DO NOT MERGE
* commit 'a284202d2f3a0b790545a02c3029c8c7dbc08103':
Import translations. DO NOT MERGE
commit 17edc5afc8c174c38b6aad0118ae48dca67d0423
am c11ff1e7: am 1cee1db9: keep history after reset to ub-mail-master-release
* commit 'c11ff1e797805590e1c352c5b13cd4ecf567b72c':
commit 2f0701eeee4b7ee904a1c45af1589dfd10d27daa
am ed032914: am db678bad: Update IEmailService
* commit 'ed032914e682cd832b948169364ceb510e5bdfd6':
Update IEmailService
commit 6b8929d88901a7315197ece6929e4c99f35ace12
am 6bd6150d: am d793a087: Add communication class for HostAuth
* commit '6bd6150d101e910e0e721b4a65e59074c44e5f6a':
Add communication class for HostAuth
commit aab5308e3ecfec8ca80fc686a951dd6df478ea2a
am a085db17: (-s ours) am 0f40c9f1: (-s ours) am 54c79998: (-s ours) Import translations. DO NOT MERGE
* commit 'a085db17664cb5d2184f6bfa2cd728ac2045152b':
Import translations. DO NOT MERGE
commit c8931eb9f3a1290c23cd4570125acf11ad8182ea
am 845d96aa: (-s ours) am 68dbea47: (-s ours) am fc76e00e: (-s ours) Import translations. DO NOT MERGE
* commit '845d96aadded3cef7ad746b95d4533be28ffc412':
Import translations. DO NOT MERGE
commit 79001b6e3ee7b6bd31f19e21aa01b858e2d593af
am 037c538d: (-s ours) am eee653bb: (-s ours) am 3b8a8d66: (-s ours) Import translations. DO NOT MERGE
* commit '037c538dce423228b17327ec2a119343236e869a':
Import translations. DO NOT MERGE
commit 5715f64fc37cb9085da60f713c5ef07e3289053a
am 453a4d30: (-s ours) am c6385cda: (-s ours) Import translations. DO NOT MERGE
* commit '453a4d308eec9622eb4f4a3a59e60dc287f56a0e':
Import translations. DO NOT MERGE
commit 5224195bd72e0ad6ecf47d06c92be761a3eae719
am 790d80ea: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '790d80ea6da592bd055773df7b98cba27ee7894f':
Remove deprecated locales - DO NOT MERGE
commit a284202d2f3a0b790545a02c3029c8c7dbc08103
am 1e486240: (-s ours) Import translations. DO NOT MERGE
* commit '1e486240996e43b853e36b4f110bf3606120c5c8':
Import translations. DO NOT MERGE
commit c11ff1e797805590e1c352c5b13cd4ecf567b72c
am 1cee1db9: keep history after reset to ub-mail-master-release
* commit '1cee1db9e209e3e11525fdf0bf3d20dc468d066d':
commit ed032914e682cd832b948169364ceb510e5bdfd6
am db678bad: Update IEmailService
* commit 'db678bada9a25089f4ea32be0d8e6d678749459c':
Update IEmailService
commit 6bd6150d101e910e0e721b4a65e59074c44e5f6a
am d793a087: Add communication class for HostAuth
* commit 'd793a08771c02d20c81acbedfc44d601d07d1c4f':
Add communication class for HostAuth
commit a085db17664cb5d2184f6bfa2cd728ac2045152b
am 0f40c9f1: (-s ours) am 54c79998: (-s ours) Import translations. DO NOT MERGE
* commit '0f40c9f19872a87d946d5deeaf19b8121ad07f64':
Import translations. DO NOT MERGE
commit 845d96aadded3cef7ad746b95d4533be28ffc412
am 68dbea47: (-s ours) am fc76e00e: (-s ours) Import translations. DO NOT MERGE
* commit '68dbea476f8e549d2ead4c09a0e29434262dc392':
Import translations. DO NOT MERGE
commit 037c538dce423228b17327ec2a119343236e869a
am eee653bb: (-s ours) am 3b8a8d66: (-s ours) Import translations. DO NOT MERGE
* commit 'eee653bbe57f014cc24a2e5a3929ffff539dbeaf':
Import translations. DO NOT MERGE
commit 9444ca00c79d52cda5427da5282e2a271f5bf0fb
am 5c115ae2: Add uses-sdk to test apk
* commit '5c115ae2f6d39ab4f8754e87100334b3f53e5c5b':
Add uses-sdk to test apk
commit 453a4d308eec9622eb4f4a3a59e60dc287f56a0e
am c6385cda: (-s ours) Import translations. DO NOT MERGE
* commit 'c6385cda77457ee578ba3d6d10a1af732e7c33b1':
Import translations. DO NOT MERGE
commit 2d85d93d754d5fab8efec2ed634e78e3c8ce4273
am 4e7c2380: Merge "Make Calendar and Contacts syncing go through EasService" into ub-mail-master
* commit '4e7c2380a17090271ed78f11901fd9edc6419c71':
Make Calendar and Contacts syncing go through EasService
commit 7c0b84eaa7001b7c43d63a1f120140168e6d4906
am 490bf9fb: Delete obsolete emailsync code
* commit '490bf9fbf2c73fb0fda0e122f291a5bb981fcc08':
Delete obsolete emailsync code
commit 3c9df18aa1b2ebec73b9be19703d41114fdcfeef
am e04c59dd: Make sure that we restart the ping when we have an EasService.
* commit 'e04c59dd3af81ce146c9676cbafc2ff685d487a4':
Make sure that we restart the ping when we have an EasService.
commit 21eef78992861f661e6c28b77316dd606bd8dfae
am ad6c0d3b: Merge "Make sure that we have an EasService in onPerformSync" into ub-mail-master
* commit 'ad6c0d3b9a33b883633d331a719b65e213a193cb':
Make sure that we have an EasService in onPerformSync
commit 5115c768018087f6ecc2e9e01311d83554f58137
am 31f1c78d: Start push pings on startup
* commit '31f1c78da099f35728a857e877c15c80a060e794':
Start push pings on startup
commit 5249e26b895a4087706c884a9199099258e0d0f6
am 2db0b681: b/15746597. Adjust workflow when there are no results for a GAL search.
* commit '2db0b68170b046b41c0319768d7018d093e536a4':
b/15746597. Adjust workflow when there are no results for a GAL search.
commit 1728bbe4ea779e25b197ab6f7214c2782c07560c
am 59e87fab: Merge "Fix NPE when mPolicy is unset" into ub-mail-master
* commit '59e87fab8d90ed97a8fc4ee62f39ba894b4c7dbb':
Fix NPE when mPolicy is unset
commit 79831b9c602a0d8d5097cd23d39f93bf6c55623b
am f5952f93: b/15742016. Fix up some error logging.
* commit 'f5952f93f5bf11a99602d4f4d5e60444eae67487':
b/15742016. Fix up some error logging.
commit a69cc0e2a1b9d27e3d9b1940b68d8c77ad7b2f2b
resolved conflicts for merge of 61ebb38e to lmp-ub-dev
commit 4475cc839c179f33c318270095df739548866bd0
keep history after reset to ub-mail-master-release
Change-Id: I5a96053542dddfc5e32756c611bf1aa61650ef6c
8 files changed