Dan Zivkovic
92d0dd0b83
am fe716f0f: Resolve some InputLogic todo comments.
...
* commit 'fe716f0f73ee551ce42b523983f92efccce79dc8':
Resolve some InputLogic todo comments.
2015-03-20 18:17:44 +00:00
Dan Zivkovic
a7cf04a394
am 5cf457c9: Remove external dictionary debug UI.
...
* commit '5cf457c976d69e05e3d93df0363f7a411b131bf9':
Remove external dictionary debug UI.
2015-03-20 18:17:42 +00:00
Dan Zivkovic
c15bbb52a3
Retire Delight2 migration code to speed up tests.
...
We're waiting 10 minutes for tests to run, and half of that time is spent in
depreacted code related to migration of Delight2 dictionary files.
LatinIME will never migrate another Delight2 dictionary file again, so we can
delete this code.
Change-Id: I05c7d8429e8d9a26139456763c77997340fea8c2
2015-03-20 11:16:46 -07:00
Dan Zivkovic
fe716f0f73
Resolve some InputLogic todo comments.
...
Change-Id: Ic3d7d11ad90cc09edf62f48aa5362e71d692f7dd
2015-03-20 10:49:15 -07:00
Dan Zivkovic
5cf457c976
Remove external dictionary debug UI.
...
We don't support this feature in Delight3.
Change-Id: Iebef4191c28cf6d169d351039174cd841d448799
2015-03-20 10:23:05 -07:00
Dan Zivkovic
e7430f76d1
am 755b3d88: Notify the facilitator on IME start/finish.
...
* commit '755b3d882f9d74ceaec7b59fe618dff3ad54f304':
Notify the facilitator on IME start/finish.
2015-03-20 17:10:29 +00:00
Dan Zivkovic
755b3d882f
Notify the facilitator on IME start/finish.
...
Allows the facilitator to flush language models without a recurring task.
Bug 19773937.
Change-Id: I01a3c10da26f9df38fee05df33387eb082e2ff33
2015-03-20 09:03:48 -07:00
David Faden
ca0b50a34a
am 6e866323: Pass DictionaryFacilitator to GestureConsumer#onImeSuggestionsProcessed.
...
* commit '6e86632311a24af90ad35c98224ae25f226c1954':
Pass DictionaryFacilitator to GestureConsumer#onImeSuggestionsProcessed.
2015-03-20 06:27:52 +00:00
David Faden
6e86632311
Pass DictionaryFacilitator to GestureConsumer#onImeSuggestionsProcessed.
...
Bug: 19712589
Change-Id: I81f9bf09b37487450780d85a1e4f752a9ba49370
2015-03-19 18:23:35 -07:00
Mohammadinamul Sheik
ab2c93e7f4
am 7df95c54: Merge "Add prev words context to the SuggestedWordInfo."
...
* commit '7df95c54fa9edd4a9fc9c267b204640299b7bad6':
Add prev words context to the SuggestedWordInfo.
2015-03-20 00:47:29 +00:00
Mohammadinamul Sheik
7df95c54fa
Merge "Add prev words context to the SuggestedWordInfo."
2015-03-20 00:41:27 +00:00
Dan Zivkovic
aae90b9f8e
am 6c1c3372: LatinIME manifest.
...
* commit '6c1c337227d101ee92b508b63b1d74293cc2e5c0':
LatinIME manifest.
2015-03-20 00:14:32 +00:00
Dan Zivkovic
6c1c337227
LatinIME manifest.
...
Changed to match minor tweaks made in LatinIMEGoogle.
Bug 19773937.
Change-Id: I04297459258c068d334b1cc6ffff52d2b4092814
2015-03-19 17:10:18 -07:00
Dan Zivkovic
c402ba43b8
am dbf117b6: Log accepted punctuation suggestions.
...
* commit 'dbf117b6613887fb4a7b39269e020940d956f009':
Log accepted punctuation suggestions.
2015-03-19 23:15:06 +00:00
Mohammadinamul Sheik
ab59129594
Add prev words context to the SuggestedWordInfo.
...
Bug: 19712589
Bug: 19715579
Change-Id: Ie06665cab8405455c1b0a2ff034e0bb0731c9156
2015-03-19 16:07:04 -07:00
Dan Zivkovic
dbf117b661
Log accepted punctuation suggestions.
...
Bug 19825927.
Change-Id: If65b56aa5c269e47bcc609bdc673ba18c450ee66
2015-03-19 15:40:40 -07:00
Ulas Kirazci
0dc6daf51f
Merge "Do not access metadatadb from main thread." into jb-ub-latinimegoogle
2015-03-19 22:07:03 +00:00
Ulas Kirazci
fdef4b73a6
Do not access metadatadb from main thread.
...
Also fix Refresh button replicating itself on orientation change.
Bug: 19786650
Change-Id: I19a964d69d9141ba6515bbe19a120d4685628fe3
2015-03-19 12:08:50 -07:00
Chieu Nguyen
254109991f
am 60835872: Set background color for emoji category tabs.
...
* commit '60835872a15992e239cf9bd038b6ee33b405f1d3':
Set background color for emoji category tabs.
2015-03-19 18:16:52 +00:00
Chieu Nguyen
60835872a1
Set background color for emoji category tabs.
...
Bug: 19686516.
Change-Id: I519d09491ded4f5d85a5951afb48a9638b5fe652
2015-03-18 18:48:30 -07:00
Chieu Nguyen
56391ce7c7
am b56f7d8c: Merge "Disable message if personalization is disabled."
...
* commit 'b56f7d8ca47e5936afe0459928bae49cae6e3615':
Disable message if personalization is disabled.
2015-03-18 22:42:23 +00:00
Chieu Nguyen
8ec36026c9
Disable message if personalization is disabled.
...
Bug: 19087415.
Change-Id: I3974f1b676aa4a9bb04ab7f609b6daf1860c64f1
2015-03-18 15:30:22 -07:00
Chieu Nguyen
add004983a
am d4ce5e94: Disable si_LK and ta_LK subtypes.
...
* commit 'd4ce5e944b849cbae65aa62f99bf2ee0796fbff3':
Disable si_LK and ta_LK subtypes.
2015-03-18 17:38:26 +00:00
Chieu Nguyen
d4ce5e944b
Disable si_LK and ta_LK subtypes.
...
Bug: 19815109
Change-Id: I3681fcf17752defdf3c1bacff9dadb60df2468ab
2015-03-18 10:24:07 -07:00
Geoff Mendal
e2da4c6ab8
Import translations. DO NOT MERGE
...
Change-Id: I81ff84baa3a48d283b0d1fa83ac0d3a440559168
Auto-generated-cl: translation import
2015-03-18 06:07:09 -07:00
Geoff Mendal
1f8a84de72
Import translations. DO NOT MERGE
...
Change-Id: Ie5dc04536740f0ed8d800cd9e292183437556b54
Auto-generated-cl: translation import
2015-03-18 06:01:39 -07:00
Mohammadinamul Sheik
9cb17fd41b
am 0bbbbdf1: Merge "Pass DictionaryFacilitator for autocorrection and suggestion stats"
...
* commit '0bbbbdf1c43d94edadf6f7996a6b5eb04f5e29c1':
Pass DictionaryFacilitator for autocorrection and suggestion stats
2015-03-17 22:45:00 +00:00
Mohammadinamul Sheik
0bbbbdf1c4
Merge "Pass DictionaryFacilitator for autocorrection and suggestion stats"
2015-03-17 22:39:17 +00:00
Tom Ouyang
617f82a646
am edcf5853: Merge "Start-of-sentence should include newlines and non-period terminators."
...
* commit 'edcf5853d1f9253e3a76e6db01731b9465da6ae0':
Start-of-sentence should include newlines and non-period terminators.
2015-03-17 22:36:16 +00:00
Tom Ouyang
edcf5853d1
Merge "Start-of-sentence should include newlines and non-period terminators."
2015-03-17 22:25:00 +00:00
Tom Ouyang
5aeb092130
Start-of-sentence should include newlines and non-period terminators.
...
Bug: 19795382
Change-Id: Id6cc4a494a06de03d351aa6257632bd3b82e2ec4
2015-03-17 15:18:42 -07:00
Mohammadinamul Sheik
4024984c1e
Pass DictionaryFacilitator for autocorrection and suggestion stats
...
Bug: 19715579
Change-Id: Ic48de74bde0f9f5d5e68e8289948cc5e92cbfa1e
2015-03-17 15:18:21 -07:00
Mohammadinamul Sheik
5789c36add
am ea727b6b: Carry over the mMaxPreWordCount when creating the new NgramContext
...
* commit 'ea727b6b71398c9f78fbc7b79d3f0c73d301b938':
Carry over the mMaxPreWordCount when creating the new NgramContext
2015-03-17 19:37:01 +00:00
Mohammadinamul Sheik
ea727b6b71
Carry over the mMaxPreWordCount when creating the new NgramContext
...
Change-Id: Iaba2e4b356486b60d550f10121695ef46e5e75da
2015-03-17 12:31:18 -07:00
Mohammadinamul Sheik
3136a7c65f
am 775d3a8d: Merge "Use BinaryDicitonary.MAX_PREV_WORD_COUNT_FOR_NGRAM for D2 dictioanries."
...
* commit '775d3a8d53067149bbf78d03e8ae132fea8387c0':
Use BinaryDicitonary.MAX_PREV_WORD_COUNT_FOR_NGRAM for D2 dictioanries.
2015-03-17 19:12:37 +00:00
Mohammadinamul Sheik
f468609223
Use BinaryDicitonary.MAX_PREV_WORD_COUNT_FOR_NGRAM for D2 dictioanries.
...
Fixes the UserHistoryDictionaryTests
Change-Id: I49776f53298ced3cd7e771cfe77a940b80b01f20
2015-03-17 11:43:16 -07:00
Dan Zivkovic
858d690f5d
am a10808d7: Merge "Remove rejected suggestion in LatinIME."
...
* commit 'a10808d7d6ac50a93a8b7400824796a703211d01':
Remove rejected suggestion in LatinIME.
2015-03-17 18:20:54 +00:00
Dan Zivkovic
a10808d7d6
Merge "Remove rejected suggestion in LatinIME."
2015-03-17 18:14:36 +00:00
Mario Tanev
fee38b8dc4
am 320cef5f: Merge "Bump up the current metadata database version to 14."
...
* commit '320cef5fe71baf049971eeac957d2fe73c57b09f':
Bump up the current metadata database version to 14.
2015-03-17 14:16:17 +00:00
Tom Ouyang
8a53b381ea
am 263dd9fe: Merge "Deprecate SuggestedWords.mSourceDict"
...
* commit '263dd9fe037784253b9837729bb5a9e51bd2f5cb':
Deprecate SuggestedWords.mSourceDict
2015-03-17 14:16:15 +00:00
Chieu Nguyen
8e8d28882f
am 56e76739: Merge "Add cloud sync setting to SettingsValues."
...
* commit '56e7673917627523dc415f156c637cb38ab99290':
Add cloud sync setting to SettingsValues.
2015-03-17 14:16:12 +00:00
Mario Tanev
320cef5fe7
Merge "Bump up the current metadata database version to 14."
2015-03-17 01:45:14 +00:00
Dan Zivkovic
8844c35e7e
Remove rejected suggestion in LatinIME.
...
Bug 19744396.
Change-Id: I64e59b3fb1ab627c70bf27a12a78d8d927da7e97
2015-03-16 18:26:37 -07:00
Tom Ouyang
263dd9fe03
Merge "Deprecate SuggestedWords.mSourceDict"
2015-03-17 01:25:21 +00:00
Mario Tanev
323d48d748
Bump up the current metadata database version to 14.
...
Change-Id: I49057f117666291c2e9e7ba3c3627f75ffc3cca5
2015-03-16 18:01:23 -07:00
Chieu Nguyen
56e7673917
Merge "Add cloud sync setting to SettingsValues."
2015-03-17 00:22:14 +00:00
Dan Zivkovic
e8eceefe36
am bff393ce: Fix NPE in AccountSettingsFragment.
...
* commit 'bff393ce13554588d3906df4e5f464199acb23ae':
Fix NPE in AccountSettingsFragment.
2015-03-17 00:17:06 +00:00
Chieu Nguyen
93205b17ff
Add cloud sync setting to SettingsValues.
...
Bug: 19573092
Change-Id: I41174188743c8a78facebff547e378a2b467a8c7
2015-03-16 17:11:52 -07:00
Dan Zivkovic
bff393ce13
Fix NPE in AccountSettingsFragment.
...
Bug 19773815.
Change-Id: Ib5eb27cdf385c81d1a3822836f424fa29c0bbaa8
2015-03-16 17:08:35 -07:00
Dan Zivkovic
b0e4b90800
am 52dafe8c: Don\'t test format version 403 twice.
...
* commit '52dafe8c321663338ba458f7ad1a08c0c838f156':
Don't test format version 403 twice.
2015-03-16 21:49:27 +00:00
Dan Zivkovic
eb2c2f3f15
am f508209f: Remove unused imports.
...
* commit 'f508209f6af74498edcc6f66b1820bdf0dad8e6a':
Remove unused imports.
2015-03-16 21:39:08 +00:00
Dan Zivkovic
52dafe8c32
Don't test format version 403 twice.
...
BinaryDictionaryTests runs all tests 3 times for 3 format verisons.
Cut that number down by 33% to speed things up.
Change-Id: I8a2f78017fa30f46b5873dcf6a5f478f57af2ebd
2015-03-16 14:38:44 -07:00
Dan Zivkovic
d9a711d10d
am 4e1f0f1b: Redundant code matches multiple languages.
...
* commit '4e1f0f1bb03551efde3bc6b0a8e60465c088cda2':
Redundant code matches multiple languages.
2015-03-16 21:18:42 +00:00
Dan Zivkovic
f508209f6a
Remove unused imports.
...
Change-Id: Ic537cc7080a0ca98fc855a6f24a415d63f747891
2015-03-16 14:17:51 -07:00
Dan Zivkovic
4e1f0f1bb0
Redundant code matches multiple languages.
...
InputLogic should not have code that tweaks suggestion ranking based on the
language of the source dictionary.
Bug 19744396.
Change-Id: I8c0849555e74cec1302e78da04148dedd1cddabe
2015-03-16 14:11:59 -07:00
Dan Zivkovic
f1b330c692
am 2321c41b: Check boxes are replaced by switches in KitKat.
...
* commit '2321c41b5bf17661e7390b7afdcf0320fbd5f134':
Check boxes are replaced by switches in KitKat.
2015-03-16 19:28:03 +00:00
Dan Zivkovic
2321c41b5b
Check boxes are replaced by switches in KitKat.
...
Make the code work for both widgets by using the TwoStatePreference interface.
Bug 19596067.
Change-Id: I8352361dcf74b54136b6177de9aac3eb2942a4c0
2015-03-16 12:03:04 -07:00
Dan Zivkovic
651d7e9d4f
am 5455179b: Revert "Next-word suggestion bit in keyboard settings."
...
* commit '5455179b54eb8230577f518db082796a3055685a':
Revert "Next-word suggestion bit in keyboard settings."
2015-03-16 18:34:24 +00:00
Dan Zivkovic
5455179b54
Revert "Next-word suggestion bit in keyboard settings."
...
This reverts commit 1ae16dc3db
.
Bug 19596067.
Change-Id: Ie7286acbb70b215d7bd08e271bcf14526b68576f
2015-03-16 11:23:22 -07:00
Geoff Mendal
180a1e363f
Merge "Import translations. DO NOT MERGE"
2015-03-16 13:05:07 +00:00
Geoff Mendal
1f7c2e61e2
Import translations. DO NOT MERGE
...
Change-Id: Ibc8572551a250720cc2bdaca75432e71f571eb02
Auto-generated-cl: translation import
2015-03-16 05:51:40 -07:00
Geoff Mendal
940b30695f
Import translations. DO NOT MERGE
...
Change-Id: Ia4c53921b3a076533158579128023ab1ae56b28e
Auto-generated-cl: translation import
2015-03-16 05:49:05 -07:00
Geoff Mendal
51e41fd52f
Import translations. DO NOT MERGE
...
Change-Id: I2bf8c23befbf5c78632c87a37ce1529d5144c498
Auto-generated-cl: translation import
2015-03-16 05:46:22 -07:00
Mohammadinamul Sheik
248dfe1247
am 900502f1: Merge "Make RichInputMethodSubtype non-final for easy mocking"
...
* commit '900502f1ec0cb66bf27ed59ecccbfd1b44ddd635':
Make RichInputMethodSubtype non-final for easy mocking
2015-03-14 03:08:47 +00:00
Mohammadinamul Sheik
900502f1ec
Merge "Make RichInputMethodSubtype non-final for easy mocking"
2015-03-14 03:04:02 +00:00
Mohammadinamul Sheik
6fa6abae2f
am 29500ef4: Fix the BinaryDictionaryTests
...
* commit '29500ef4ba8e01f4c467a62399c8249d532ee82c':
Fix the BinaryDictionaryTests
2015-03-14 01:29:06 +00:00
Mohammadinamul Sheik
29500ef4ba
Fix the BinaryDictionaryTests
...
Change-Id: I09378d74705e6943946ea4f76b15664086a387ed
2015-03-13 18:21:22 -07:00
Mohammadinamul Sheik
f04e2ed83a
Make RichInputMethodSubtype non-final for easy mocking
...
Change-Id: I167bc56b5224eb389ec853aeb539d7fcf79b81e1
2015-03-13 17:05:11 -07:00
Mohammadinamul Sheik
b27553ed7e
am 93d2ab38: Add StatsUtils.onSettingsActivity to collect the settings page stats.
...
* commit '93d2ab38577fb3d7c919bc4fd19a769f5c93e654':
Add StatsUtils.onSettingsActivity to collect the settings page stats.
2015-03-13 23:20:47 +00:00
Mohammadinamul Sheik
93d2ab3857
Add StatsUtils.onSettingsActivity to collect the settings page stats.
...
Bug:19214944
Change-Id: I113f47c49d638790d770fe2781afe7cd1565619d
2015-03-13 16:12:14 -07:00
Tom Ouyang
89e2d93634
Deprecate SuggestedWords.mSourceDict
...
Change-Id: I29d9bec427660a7a501054fe9b1ea71be2d5ee3f
2015-03-13 14:30:18 -07:00
Chieu Nguyen
3b08ef1d5b
am 116e58c4: Remove autocorrection aggressiveness settings.
...
* commit '116e58c437526ea2503564317e2731b8126acaa4':
Remove autocorrection aggressiveness settings.
2015-03-13 21:09:32 +00:00
Chieu Nguyen
116e58c437
Remove autocorrection aggressiveness settings.
...
Replace multiple settings with binary switch for autocorrection.
Bug: 19589766
Change-Id: Ic8a0362dd36d18930493a55699851161e9cb23e8
2015-03-13 12:21:26 -07:00
Mohammadinamul Sheik
99846fab18
am 80f90349: Log.i on dictionary download start
...
* commit '80f90349555ac22f83175e6f19d1ed5e0d673d85':
Log.i on dictionary download start
2015-03-13 19:11:45 +00:00
Mohammadinamul Sheik
80f9034955
Log.i on dictionary download start
...
Change-Id: I8b501fb5512d4d3bbca75e4c4be7c7eb95f32020
2015-03-13 11:53:33 -07:00
Mario Tanev
e4ba918add
am b9a16b88: Bump up the current metadata database version.
...
* commit 'b9a16b88bf5b976e47b50f66b646f002954a5d83':
Bump up the current metadata database version.
2015-03-13 17:52:29 +00:00
Mario Tanev
b9a16b88bf
Bump up the current metadata database version.
...
Change-Id: Id2814a2224b90ba124f1c9801760a2c86f2dc2e2
2015-03-13 10:39:05 -07:00
Dan Zivkovic
48d8911597
am eaa710d4: Separate executor for the Spelling decoder.
...
* commit 'eaa710d4aaac75ff2b7e29608d004fe7662b392e':
Separate executor for the Spelling decoder.
2015-03-13 02:20:31 +00:00
Dan Zivkovic
eaa710d4aa
Separate executor for the Spelling decoder.
...
Bug 19710676.
Change-Id: I6e66eddd507c11e424105869833fe6841b90275d
2015-03-12 17:10:38 -07:00
Jatin Matani
44d4a1c524
Fix some i18n messaging
...
Bug:19538786
Bug:19542029
Change-Id: Ifc06064308f899527283378dda0c44223df7e9e9
2015-03-12 12:44:20 -07:00
Dan Zivkovic
326261181d
am 26fb83c4: Avoid creating empty String[].
...
* commit '26fb83c481034cb9dbc9504e60fde40c6b213e97':
Avoid creating empty String[].
2015-03-12 18:08:29 +00:00
Dan Zivkovic
26fb83c481
Avoid creating empty String[].
...
Minor cleanup on the way to fixing spelling for downloaded language.
Bug 19710676.
Change-Id: I7be25fa82248f0317d894d44802bede9dbc4fe2a
2015-03-12 10:49:29 -07:00
Dan Zivkovic
b724ff1d11
am 7e1dfaae: Merge "Remove ALS from LatinIME."
...
* commit '7e1dfaae3d6ca9aff1acfa9b358ad0b759ef0ec8':
Remove ALS from LatinIME.
2015-03-12 17:22:37 +00:00
Dan Zivkovic
7e1dfaae3d
Merge "Remove ALS from LatinIME."
2015-03-12 17:17:59 +00:00
Chieu Nguyen
2c3aae8a0c
am 74c37f40: Merge "Remove setting switch for phrase gesture."
...
* commit '74c37f4089441c9f98522bd785d7f39b271f3936':
Remove setting switch for phrase gesture.
2015-03-12 00:32:08 +00:00
Chieu Nguyen
3b23d1871e
am 4e0af436: Remove unused phrase gesture code.
...
* commit '4e0af43673936c336fff298bc9aeee1d75c3bc92':
Remove unused phrase gesture code.
2015-03-12 00:32:06 +00:00
Dan Zivkovic
107fb4c476
Remove ALS from LatinIME.
...
This fixes unit tests and brings us closer to a green build.
Change-Id: Iffcc392eda4a7671a238b79cc7367320ca648725
2015-03-11 17:29:12 -07:00
Chieu Nguyen
74c37f4089
Merge "Remove setting switch for phrase gesture."
2015-03-12 00:28:12 +00:00
Chieu Nguyen
4e0af43673
Remove unused phrase gesture code.
...
Bug: 19687841
Change-Id: I0862aa3127bf7f1564a4845efdf99ebf5ae4d5ac
2015-03-11 17:09:44 -07:00
Dan Zivkovic
9a2e1ef6b4
am 9a289da4: Remove deprecated distractor filtering methods.
...
* commit '9a289da4e6ea40417422a540e821069d5d6e4a82':
Remove deprecated distractor filtering methods.
2015-03-11 23:16:01 +00:00
Dan Zivkovic
9a289da4e6
Remove deprecated distractor filtering methods.
...
Change-Id: I10ccf75d9c00d66b4e85de6c3c019242f2e90b0e
2015-03-11 14:39:48 -07:00
Dan Zivkovic
5a447b846e
am 7472cc82: Mark method @UsedForTesting
...
* commit '7472cc824581b8a3c1ede286c8b0704040cef257':
Mark method @UsedForTesting
2015-03-11 21:06:34 +00:00
Dan Zivkovic
7472cc8245
Mark method @UsedForTesting
...
This prevents it from being optimized away.
Change-Id: Iecd317568e23e86e4c0ece8134a4926a7a56d65b
2015-03-11 14:00:30 -07:00
Dan Zivkovic
d65d8e71d4
am 820317f7: Make inner classes visible for testing.
...
* commit '820317f7aae3f5efd2354e2804ad4bd19f067677':
Make inner classes visible for testing.
2015-03-11 20:55:58 +00:00
Dan Zivkovic
820317f7aa
Make inner classes visible for testing.
...
We need this to assert the correct behavior in the facilitator.
Bug 19695605.
Change-Id: I3923d00791c99208bc72f7c4210ae1ea0a34bd0e
2015-03-11 13:40:20 -07:00
Chieu Nguyen
e787b3b761
Remove setting switch for phrase gesture.
...
Bug: 19687841
Change-Id: I74ed9acfd5330d7461233d4146395aefb9d2d9c4
2015-03-11 12:06:22 -07:00
Dan Zivkovic
14125949c6
am 4621365b: Merge "Delete user history files."
...
* commit '4621365b216559c3dd3d0e22ec05cdaba78acc3d':
Delete user history files.
2015-03-11 19:01:25 +00:00
Dan Zivkovic
4621365b21
Merge "Delete user history files."
2015-03-11 18:53:23 +00:00
Dan Zivkovic
bdd6c995ce
Delete user history files.
...
Bug 19669016.
Change-Id: I8069fe561347851bf3c27423dbd8ba99d38c049e
2015-03-11 11:46:15 -07:00
Geoff Mendal
74fa851030
Import translations. DO NOT MERGE
...
Change-Id: I58400f537f28e89f19faf95547d2f3ecb67368fa
Auto-generated-cl: translation import
2015-03-11 05:33:56 -07:00