aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-11-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I598c4282b342132f3f9937a9652f570c3c1bc246 Auto-generated-cl: translation import
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bayoBaligh Uddin2013-11-0111-1243/+65
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-2811-1243/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3b0f523c86598e0dcf3d3c41e3bfcd5f87c116d Auto-generated-cl: translation import
| * | | | | | | | | These files were in the obsoleted localeBaligh Uddin2013-10-316-0/+150
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directories and are not processed by the translation pipeline. Moving them to their new locale directory. Example: values-et/bools.xml moved to values-et-rEE/bools.xml Bug: 11244796
| * | | | | | | | Stopgap solution for a crash.Jean Chalard2013-10-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the wrong string, but since it's used for getting the previous word for bigrams, it only results in slightly worse suggestions quality. Bug: 11273655 Change-Id: I6ce5de2f76effc453ca691a654ab6bf17445b9e7
| * | | | | | | | Fix a bug where autocaps would jam auto-commitJean Chalard2013-10-222-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11311002 Change-Id: I62955e364c9ffc75322cf05fa3ad7985f1d09259
| * | | | | | | | Update Setup Wizard welcome video & imageKen Wakasa2013-10-222-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 11227246 Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
| * | | | | | | | Fix: Suggested words from user history are invalid.Keisuke Kuroyanagi2013-10-222-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Suggestions form user history can contain invalid words. - isValidWord always returns false. Bug: 11139426 Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
| * | | | | | | | Fix a bug where autoshift would be ignored coming from emojiJean Chalard2013-10-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11123691 Change-Id: I36474e12e34af95051129840865015f85595411b
| * | | | | | | | Don't show long-pressing emoji key on tabletSatoshi Kataoka2013-10-221-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11264603 Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
| * | | | | | | | Fix keyboard layoutSatoshi Kataoka2013-10-224-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show "..." on enter key if it has long-pressing emoji key - Show enter key on symbols shift keyboard Bug: 11262889 Bug: 11263464 Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
| * | | | | | | | am a62dc281: Update input method subtype locales.Ken Wakasa2013-10-221-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a62dc28121d72978d527eec2791d1caf43b563b8': Update input method subtype locales. Change-Id: Id28f5ee33c201e1d335119c1b3d99bc30a10a131
| * | | | | | | | am af846af8: Remove Azerbaijani subtypeSatoshi Kataoka2013-10-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af846af8bb7e4b49c99d7b0e051e70d03a5b7359': Remove Azerbaijani subtype
| * | | | | | | | Add a sequence number to SuggestedWords.Jean Chalard2013-10-223-57/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows testing for suggestion freshness in an asynchronous suggestions world. In-advance cherrypick of Ic76cd17568598d8534aec81e037f9e37f52eb6b4 because there's a merge conflict. Bug: 11301597 Change-Id: I4aec765a975298fcac30a48dede73d2622224fe5
| * | | | | | | | Merge "Remove unexpectedly used resources" into jb-ub-latinimegoogle-bayosatok2013-10-180-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove unexpectedly used resourcessatok2013-10-1811-1148/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I847e303b1a3843e5a95d1ecb2802e3779c8f085b
| * | | | | | | | | Remove unexpectedly used resourcesSatoshi Kataoka2013-10-1826-2840/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I291269dbca71805a40d48a0e373b9561ad075f6b
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-156-3/+1181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83d28c60de84b09da48bd79aa9917f12bd850fdc Auto-generated-cl: translation import
| * | | | | | | | merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogleThe Android Automerger2013-10-150-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-125-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If437fe9dd00e8d95d1d3b99eebf360bcf288bb40 Auto-generated-cl: translation import
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1129-107/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fb4d68f58d5ff9f67186c0c32a977f5bf63b243 Auto-generated-cl: translation import
| * | | | | | | | | am d617c2d9: am eb870b14: am 34ad4e08: am b9ce8421: ↵Ken Wakasa2013-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mExpectingUpdateSelection was out of sync when nothing to delete. * commit 'd617c2d976ce60b4a88960a4504a0f237a561ecb': mExpectingUpdateSelection was out of sync when nothing to delete.
| * \ \ \ \ \ \ \ \ \ am b0440472: mExpectingUpdateSelection was out of sync when nothing to delete.Ken Wakasa2013-10-141-10/+24
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b04404722729f2fa988c46c4d9080415332bbeb5': mExpectingUpdateSelection was out of sync when nothing to delete.
| * \ \ \ \ \ \ \ \ \ \ am cf5dfd24: am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText ↵Ken Wakasa2013-10-142-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter in sendKeyCodePoint() * commit 'cf5dfd2464d700f28fe7d8d48150d657274dd2ef': Fix wrong commitText parameter in sendKeyCodePoint()
| * \ \ \ \ \ \ \ \ \ \ \ am 1ab9edee: (-s ours) am 8a866d6f: (-s ours) am f68ef910: (-s ours) am ↵Baligh Uddin2013-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdc4c1dc: (-s ours) Import translations. DO NOT MERGE * commit '1ab9edee2fcf2829015b580f8b7171b8676018a0': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ am 9e4210ba: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e4210ba3a3a40336e21c69a21b9ba7af26d1df1': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3282562a318563d607fea65c51efba90547d202 Auto-generated-cl: translation import
| * | | | | | | | | | | | | | am 1789d839: (-s ours) am e35594f9: (-s ours) am 3c8bbd2f: (-s ours) am ↵Baligh Uddin2013-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1789d83949241abae6475ba9ff53247f8f4c613e': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8f99107b: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f99107bbb612fc10fe8640021a4258f3287f1ec': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-10-114-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-114-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic51ef12040f5586db280ad1f0f9721c5c0e7f3c4 Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | | | am fe97ff40: am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji ↵Ken Wakasa2013-10-112-9/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separators" into klp-dev * commit 'fe97ff40836e71ef80c35d93367a54088586452e': Make emoji separators
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eb7fa4dc: am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where ↵Satoshi Kataoka2013-10-112-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emojis would remove the suggestion strip." into klp-dev * commit 'eb7fa4dc6d1bd629a34adcf6423c534352d0b00c': Fix a bug where emojis would remove the suggestion strip.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7abdab1c: Merge "Add a time stamp for unigrams."Ken Wakasa2013-10-112-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7abdab1c6fe693f11cc5ee385b2ff4d5a84cfaf4': Add a time stamp for unigrams.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 00e02489: Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"Ken Wakasa2013-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '00e0248984c4fca912c59568eb6c394bf9530b73': Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3def959e: am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the ↵Jean Chalard2013-10-111-9/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion size." into klp-dev * commit '3def959e4deda3d8cbc9a1a7518c335086e3d062': Fix the suggestion size.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am be22a01d: Merge "Add resolveBigramPositions."Ken Wakasa2013-10-111-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be22a01df33d809a83c4bed402428f98fa47c370': Add resolveBigramPositions.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ed7d262e: (-s ours) am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: ↵Satoshi Kataoka2013-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not merge. Save / restore the last used emoji category" into klp-dev * commit 'ed7d262eeb86b1f336ca9b79db072aa53ac956fb': Do not merge. Save / restore the last used emoji category
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6026a958: Merge "Save / restore the last used emoji category"Satoshi Kataoka2013-10-112-11/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6026a9581685b2d91fc5bd6cf33a506d5560c238': Save / restore the last used emoji category
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9514ed5c: Add the new format of bigram entries.Yuichiro Hanada2013-10-105-27/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9514ed5c2a49e645e2d468f7191d54d77d9f127f': Add the new format of bigram entries.
| * | | | | | | | | | | | | | | | | | | | | | | | | am 84994295: (-s ours) am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: ↵Ken Wakasa2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev * commit '849942950e50f5f53c5fd22a7a5641e9d496fdeb': Tweak vertical gap of Emoji palette. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 604f523e: (-s ours) am e38ed07c: (-s ours) am 07baf17c: am f9d7d17f: ↵Ken Wakasa2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev * commit '604f523ef20c4ef565386a203ccba15a699c5595': Retry to tweak punctuations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 295fda09: (-s ours) am 3bd1f24f: (-s ours) am 49d8b8ca: am c8e4ad07: ↵Satoshi Kataoka2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support sw540 (ultra Z). DO NOT MERGE * commit '295fda09ecc8a3f6de8300765662d86d7d7289f2': Support sw540 (ultra Z). DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ae408df1: am 273ca4c3: am 2783fcec: am 2d74136e: keep history after reset ↵Baligh Uddin2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to jb-ub-latinimegoogle-bayo * commit 'ae408df19ccd6ec7113702fb4276a3be8e95c6f5':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c48143b9: am 6d0d4b85: am e75cd64a: am 8105ea2f: keep history after reset ↵Baligh Uddin2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to jb-ub-latinimegoogle-bayo * commit 'c48143b9220abd64d681f3a4ff81f2b2cbbcc531':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4d7b1102: am ddb0f5a2: am 8e9ce07b: am a6a6abc8: Fix the security related ↵Satoshi Kataoka2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API change for PreferenceActivity * commit '4d7b11020a5249fd987400fa9dad195cf6917d4a': Fix the security related API change for PreferenceActivity
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 44df1394: am 22888291: am 6beb03df: am 6862b819: Fix crash in ↵Satoshi Kataoka2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AdditionalSubtypeUtils * commit '44df13949a069eb18e99ae6584ff5ac72f1d39aa': Fix crash in AdditionalSubtypeUtils
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 51764e83: am b7922678: am 3815e4d2: am 965eac66: merge in ↵The Android Automerger2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle * commit '51764e8347fcee99e4c23073e16252d01484239f': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ab581457: am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix ↵Satoshi Kataoka2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the position of emoji palette" * commit 'ab581457ae46e43bbfcc4927cd48b2fc1262c983':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6b1fbd50: am 5e70e91e: am ef2add6f: am 1d24f19b: am c040d59d: Merge "Add ↵Ken Wakasa2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more_keys_for_* declarations for the Swedish keyboard." * commit '6b1fbd50e790893689f244a986a547d38bdc7a11':