aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5dbecb8409 -s oursGeoff Mendal2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b43157e7b -s ours * commit '7b43157e7b2ecca80e1d1b32df8ee776dfdcf831':
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5dbecb8409 -s ours * commit '5dbecb8409f32a7322d33746916e8c417b770147': Import translations. DO NOT MERGE
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b8643b22c6 ↵Geoff Mendal2015-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 9287820e6d -s ours am: dd4ad75251 -s ours * commit 'dd4ad75251da32484fe285610fa64e257492a187': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b8643b22c6 ↵Geoff Mendal2015-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 9287820e6d -s ours * commit '9287820e6d59a75defe578ff6a7d22baa8c62275': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devGeoff Mendal2015-11-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b8643b22c6 -s ours * commit 'b8643b22c6c5aba3fb362ba2feda7b5fa8ff2014': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devGeoff Mendal2015-11-1677-85/+817
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-85/+817
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9670893071d981904e3a9eca8ebef55ac1cc265 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 006c30a36e -s ours am: c6b1a4fba1 -s ↵Geoff Mendal2015-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 192cbb9e35 -s ours * commit '192cbb9e3524301ec515c623cdddc49fa08a113e': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 006c30a36e -s oursGeoff Mendal2015-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c6b1a4fba1 -s ours * commit 'c6b1a4fba154c0579671fbf14c376da38239b9c6': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 006c30a36e -s ours * commit '006c30a36eec7914481860724332d44b3cb8d718': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-59/+73995
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab1557d1610a2b3a68f9a29b1bff565a83fe3ff0 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 9d435e6f43 ↵Geoff Mendal2015-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: c36312f883 -s ours * commit 'c36312f883b7999796da62e0b2d58c43edd651b0': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2015-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9d435e6f43 -s ours * commit '9d435e6f43baf1ac5a9df38b584646b08015b64c': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2015-11-1677-85/+817
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-85/+817
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72546cce9ec50ddb468bbd3d989ceb3b6adb4627 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5dbecb8409 -s oursGeoff Mendal2015-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9369310121 -s ours * commit '93693101215c811c56163de75d20ce7a8f260d57': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-160-0/+0
| |\| | | | | | | | | | | | | | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5dbecb8409 -s ours * commit '5dbecb8409f32a7322d33746916e8c417b770147': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-59/+73995
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42db5a73ba835ce778019b8375fce0c7b1271e15 Auto-generated-cl: translation import
* | | | | | | | | | | | | Import translations. DO NOT MERGE am: 76218d9045 -s ours am: b6e8df2cf1 -s ↵Geoff Mendal2015-11-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 23d90ed34d -s ours am: 7d605cf082 -s ours * commit '7d605cf08218eeb6f5a11bf8de448bf55cd1d2b5': Import translations. DO NOT MERGE
| * | | | | | | | | | | | Import translations. DO NOT MERGE am: 76218d9045 -s ours am: b6e8df2cf1 -s ↵Geoff Mendal2015-11-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 23d90ed34d -s ours * commit '23d90ed34d78ee9af8865f67cceee0415ba6cf9c': Import translations. DO NOT MERGE
| | * | | | | | | | | | | Import translations. DO NOT MERGE am: 76218d9045 -s oursGeoff Mendal2015-11-140-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b6e8df2cf1 -s ours * commit 'b6e8df2cf10acff16a0267483ec3764b8f78a617': Import translations. DO NOT MERGE
| | | * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-140-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 76218d9045 -s ours * commit '76218d9045409d1881a72a20ece23dc6371070e7': Import translations. DO NOT MERGE
| | | | * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1477-77/+539
| | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f10dd89298df82a8cf092a0de3d4a635ab7e696 Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1477-77/+539
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic599f7fbe1cedc69ae82ecb2af85141617f628dd Auto-generated-cl: translation import
* | | | | | | | | | | | Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 am: ↵Chieu Nguyen2015-11-11114-26/+3583
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fab2818b96 am: 305aef9c87 am: 8fb57af3e9 * commit '8fb57af3e9ee1c01352e9c69ddb33d460f828b17': Unicode 8.0 emoji additions to Google Keyboard.
| * | | | | | | | | | | Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 am: fab2818b96Chieu Nguyen2015-11-11114-26/+3583
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 305aef9c87 * commit '305aef9c877205dee2ed5afefb06a2274376a25b': Unicode 8.0 emoji additions to Google Keyboard.
| | * | | | | | | | | | Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367Chieu Nguyen2015-11-11114-26/+3583
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fab2818b96 * commit 'fab2818b96c7b85f4c415576dd8c03fa6e067c7e': Unicode 8.0 emoji additions to Google Keyboard.
| | | * | | | | | | | | Unicode 8.0 emoji additions to Google Keyboard.Chieu Nguyen2015-11-11114-26/+3583
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7674a65367 * commit '7674a653678b542d795b0bd05c241654ffe1015a': Unicode 8.0 emoji additions to Google Keyboard.
| | | | * | | | | | | | Unicode 8.0 emoji additions to Google Keyboard.Chieu Nguyen2015-11-11114-26/+3583
| | | | | |_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018 Author: Chieu Nguyen <cvnguyen@google.com> Date: Tue Nov 10 11:29:44 2015 -0800 Remove check for version code. This was unnecessary and caused multi-codepoint emoji to not show up on any device. Bug: 25369504 Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed commit 1b924816665a3a2c48307dbdd1078f61dd3179f2 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 18:12:58 2015 -0800 Fix Material icons for new tab. Bug: 25369504 Bug: 16185905 Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2 commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 17:16:10 2015 -0800 Remove extraneous TalkBack descriptions. Bug: 25369504 Bug: 16185905 Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096 commit 07357bdec69b5fc118c82401d59b61ad7b802c22 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 16:01:34 2015 -0800 Better checking of whether to display new emoji. Bug: 25369504 Bug: 16185905 Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f commit 666a92f17034f5a1948e70f40226ed995c72d81f Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 12:54:53 2015 -0800 Fix shading on emoji category icons. Bug: 25369504 Bug: 16185905 Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56 commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 19:06:57 2015 -0800 Add new emoji categories to Holo Blue. Bug: 25369504 Bug: 16185905 Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 18:06:35 2015 -0800 Fix default category, remove xxxhdpi Holo icons. Bug: 25369504 Bug: 16185905 Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6 commit 15c0b578343db2baa873096891a69305398eb830 Merge: 77bc6fc 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:08 2015 +0000 Merge changes into jb-ub-latinimegoogle commit 77bc6fcfd760232757b5751993c0046f2a43626a Merge: b0380a0 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:04 2015 +0000 Merge "Remove Kosovo from flags (no glyph)." into jb-ub-latinimegoogle commit b0380a0744647039278ad6648b7a1bc94eeab623 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:42:24 2015 -0800 Add icons for new emoji categories. Bug: 25369504 Bug: 16185905 Change-Id: I1182e031994332b2e618406ad1cd467cb050766e commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:29:33 2015 -0800 Remove Kosovo from flags (no glyph). Bug: 25369504 Bug: 16185905 Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5 commit e0489eab47d3a6d138bfa00a668f02bcb473cf88 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 14:30:58 2015 -0800 Update emoji set to blacklist non-color glyphs. Bug: 25369504 Bug: 16185905 Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463 commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483 Author: Chieu Nguyen <cvnguyen@google.com> Date: Wed Nov 4 17:18:22 2015 -0800 Add Unicode 8.0 emoji to emoji palette. Currently all emoji category tabs use the flower icon. A future CL will update these once the icons are finalized. If glyphs do not exist for new emoji, the old categories will be shown. Bug: 25369504 Bug: 16185905 Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121 commit 4a4a042072790b19048a14d2ddab655b1be31a6e Author: Chieu Nguyen <cvnguyen@google.com> Date: Sun Nov 1 18:38:20 2015 -0800 Add description strings for Unicode 8.0 new emoji. Bug: 16185905 Bug: 25369504 Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17 Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
* | | | | | | | | | | Import translations. DO NOT MERGE am: 4de1e2262e -s ours am: 826c31f06d -s ↵Geoff Mendal2015-11-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 076414fde9 -s ours am: 06780bd915 -s ours * commit '06780bd91505f3def6c983e0c37cbcc7b9837c77': Import translations. DO NOT MERGE
| * | | | | | | | | | Import translations. DO NOT MERGE am: 4de1e2262e -s ours am: 826c31f06d -s ↵Geoff Mendal2015-11-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 076414fde9 -s ours * commit '076414fde9646540ee546c8e001a3654ef34b725': Import translations. DO NOT MERGE
| | * | | | | | | | | Import translations. DO NOT MERGE am: 4de1e2262e -s oursGeoff Mendal2015-11-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 826c31f06d -s ours * commit '826c31f06dc2c6abd466195a3e1f2c5f511c18b1': Import translations. DO NOT MERGE
| | | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4de1e2262e -s ours * commit '4de1e2262e1d81f8d015a2ea3ccace35316308d0': Import translations. DO NOT MERGE
| | | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-112-3/+3
| | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2017e067aadd10ca7d2ea82c3a54c2b04fc2cf3 Auto-generated-cl: translation import
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2921b5d5af7b2aa4f89481e33ab429eff75cf070 Auto-generated-cl: translation import
* | | | | | | | | | Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 am: ↵Ian Pedowitz2015-11-10113-2672/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ce99504c5 am: 25dcdc2b15 am: 32b49b95cd * commit '32b49b95cdd6c5f87c166517c1f5c26eda1ac8fd': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| * | | | | | | | | Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 am: ↵Ian Pedowitz2015-11-10113-2672/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ce99504c5 am: 25dcdc2b15 * commit '25dcdc2b15bafc912ebc281f22deab6538d4a1fb': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| | * | | | | | | | Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683Ian Pedowitz2015-11-10113-2672/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ce99504c5 * commit '1ce99504c5295eb4aef5df87db8d2bfc42001302': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| | | * | | | | | | Revert "Unicode 8.0 emoji changes to Google Keyboard."Ian Pedowitz2015-11-10113-2672/+26
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e1d5012683 * commit 'e1d501268396e58bfdd37a0a50dfeb2ac48139a8': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| | | | * | | | | | Revert "Unicode 8.0 emoji changes to Google Keyboard."Ian Pedowitz2015-11-10113-2672/+26
| | | | | |_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9cc42549d18f1e28ffc8dae94ff36728933f53f1. Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
* | | | | | | | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 am: 3544e4c5ca am: 892de8796f * commit '892de8796f2e656b462b5460b584b771cc7c53ed': Revert "Add description strings for Unicode 8.0 new emoji."
| * | | | | | | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 am: 3544e4c5ca * commit '3544e4c5ca76a7adbb87b2e5b5a82f9f16f833a5': Revert "Add description strings for Unicode 8.0 new emoji."
| | * | | | | | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 * commit '89efd96db6b8d76c256e65968cb166af1f0df698': Revert "Add description strings for Unicode 8.0 new emoji."
| | | * | | | | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 * commit '9dfac101f2c7c34992e0214c09ee34f20b396bb1': Revert "Add description strings for Unicode 8.0 new emoji."
| | | | * | | | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | | | | | | | | | mnc-dr-dev
| | | | | * | | | Revert "Add description strings for Unicode 8.0 new emoji."Ian Pedowitz2015-11-101-916/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 332181b8343492c8f0bc5237610ae4014fd5b225. Change-Id: Ic7c494292249f86159ec6f4bc1f7a72859b10282
* | | | | | | | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev ↵Reena Lee2015-11-091-0/+916
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 am: 2c56e60003 am: f25c8c6c6f am: 2521d1e485 * commit '2521d1e48518ba9a9cab1bb0de16e45a3c0514b3': Add description strings for Unicode 8.0 new emoji.
| * | | | | | | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev ↵Reena Lee2015-11-091-0/+916
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 am: 2c56e60003 am: f25c8c6c6f * commit 'f25c8c6c6fa94cc6a1a5d8f04b490b78093b5c63': Add description strings for Unicode 8.0 new emoji.
| | * | | | | | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev ↵Reena Lee2015-11-091-0/+916
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 am: 2c56e60003 * commit '2c56e600037bf48e64474d06cf491ca0347ff5fc': Add description strings for Unicode 8.0 new emoji.
| | | * | | | | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-devReena Lee2015-11-091-0/+916
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 * commit '9749f1f1c3755ece6ddfc822d642ac0e8218d138': Add description strings for Unicode 8.0 new emoji.