nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,786 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

38786 Commits (9aa5d489aa96d74f602348eb4f274c8fafbcd887)

Author SHA1 Message Date
Geoff Mendal 024e1cdd55 Import translations. DO NOT MERGE 
Change-Id: I3ceefd186d7ee9f1c8c7039548d4b7f6794d6188
Auto-generated-cl: translation import
 2015-11-14 07:00:02 -08:00
Geoff Mendal 76218d9045 Import translations. DO NOT MERGE 
Change-Id: I2f10dd89298df82a8cf092a0de3d4a635ab7e696
Auto-generated-cl: translation import
 2015-11-14 06:57:59 -08:00
Geoff Mendal 304a901c8a Import translations. DO NOT MERGE 
Change-Id: Ic599f7fbe1cedc69ae82ecb2af85141617f628dd
Auto-generated-cl: translation import
 2015-11-14 06:45:49 -08:00
Chieu Nguyen 39a14715ef Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 am: fab2818b96 am: 305aef9c87 
am: 8fb57af3e9

* commit '8fb57af3e9ee1c01352e9c69ddb33d460f828b17':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 22:14:12 +00:00
Chieu Nguyen 8fb57af3e9 Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 am: fab2818b96 
am: 305aef9c87

* commit '305aef9c877205dee2ed5afefb06a2274376a25b':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 22:05:28 +00:00
Chieu Nguyen 305aef9c87 Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 
am: fab2818b96

* commit 'fab2818b96c7b85f4c415576dd8c03fa6e067c7e':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 21:58:59 +00:00
Chieu Nguyen fab2818b96 Unicode 8.0 emoji additions to Google Keyboard. 
am: 7674a65367

* commit '7674a653678b542d795b0bd05c241654ffe1015a':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 21:54:20 +00:00
Chieu Nguyen 0f1be93053 Unicode 8.0 emoji additions to Google Keyboard. 
am: 7674a65367

* commit '7674a653678b542d795b0bd05c241654ffe1015a':
  Unicode 8.0 emoji additions to Google Keyboard.
 2015-11-11 21:54:20 +00:00
Chieu Nguyen 7674a65367 Unicode 8.0 emoji additions to Google Keyboard. 
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
 2015-11-11 11:04:45 -08:00
Geoff Mendal 365894e1d1 Import translations. DO NOT MERGE am: 4de1e2262e -s ours am: 826c31f06d -s ours am: 076414fde9 -s ours 
am: 06780bd915  -s ours

* commit '06780bd91505f3def6c983e0c37cbcc7b9837c77':
  Import translations. DO NOT MERGE
 2015-11-11 13:46:25 +00:00
Geoff Mendal 06780bd915 Import translations. DO NOT MERGE am: 4de1e2262e -s ours am: 826c31f06d -s ours 
am: 076414fde9  -s ours

* commit '076414fde9646540ee546c8e001a3654ef34b725':
  Import translations. DO NOT MERGE
 2015-11-11 13:42:33 +00:00
Geoff Mendal 076414fde9 Import translations. DO NOT MERGE am: 4de1e2262e -s ours 
am: 826c31f06d  -s ours

* commit '826c31f06dc2c6abd466195a3e1f2c5f511c18b1':
  Import translations. DO NOT MERGE
 2015-11-11 13:39:46 +00:00
Geoff Mendal 826c31f06d Import translations. DO NOT MERGE 
am: 4de1e2262e  -s ours

* commit '4de1e2262e1d81f8d015a2ea3ccace35316308d0':
  Import translations. DO NOT MERGE
 2015-11-11 13:35:31 +00:00
Geoff Mendal e12d374f68 Import translations. DO NOT MERGE 
am: 4de1e2262e  -s ours

* commit '4de1e2262e1d81f8d015a2ea3ccace35316308d0':
  Import translations. DO NOT MERGE
 2015-11-11 13:35:30 +00:00
Geoff Mendal 191ec80423 Import translations. DO NOT MERGE 
Change-Id: I856b3184faf72ef8d16d849046d6fb7f05e8c67f
Auto-generated-cl: translation import
 2015-11-11 05:31:11 -08:00
Geoff Mendal 4de1e2262e Import translations. DO NOT MERGE 
Change-Id: Ib2017e067aadd10ca7d2ea82c3a54c2b04fc2cf3
Auto-generated-cl: translation import
 2015-11-11 05:29:20 -08:00
Geoff Mendal 0bc600a5cc Import translations. DO NOT MERGE 
Change-Id: I2921b5d5af7b2aa4f89481e33ab429eff75cf070
Auto-generated-cl: translation import
 2015-11-11 05:22:48 -08:00
Ian Pedowitz 5af8f71a73 Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 am: 1ce99504c5 am: 25dcdc2b15 
am: 32b49b95cd

* commit '32b49b95cdd6c5f87c166517c1f5c26eda1ac8fd':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:37:33 +00:00
Ian Pedowitz 22c4c919da Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 am: 3544e4c5ca 
am: 892de8796f

* commit '892de8796f2e656b462b5460b584b771cc7c53ed':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:37:16 +00:00
Ian Pedowitz 32b49b95cd Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 am: 1ce99504c5 
am: 25dcdc2b15

* commit '25dcdc2b15bafc912ebc281f22deab6538d4a1fb':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:35:15 +00:00
Ian Pedowitz 892de8796f Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 
am: 3544e4c5ca

* commit '3544e4c5ca76a7adbb87b2e5b5a82f9f16f833a5':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:34:58 +00:00
Ian Pedowitz 25dcdc2b15 Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 
am: 1ce99504c5

* commit '1ce99504c5295eb4aef5df87db8d2bfc42001302':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:33:01 +00:00
Ian Pedowitz 3544e4c5ca Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev am: 9dfac101f2 
am: 89efd96db6

* commit '89efd96db6b8d76c256e65968cb166af1f0df698':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:32:45 +00:00
Ian Pedowitz 1ce99504c5 Revert "Unicode 8.0 emoji changes to Google Keyboard." 
am: e1d5012683

* commit 'e1d501268396e58bfdd37a0a50dfeb2ac48139a8':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:30:57 +00:00
Ian Pedowitz 09a2d702e3 Revert "Unicode 8.0 emoji changes to Google Keyboard." 
am: e1d5012683

* commit 'e1d501268396e58bfdd37a0a50dfeb2ac48139a8':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."
 2015-11-10 03:30:57 +00:00
Ian Pedowitz c405679362 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev 
am: 9dfac101f2

* commit '9dfac101f2c7c34992e0214c09ee34f20b396bb1':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:30:34 +00:00
Ian Pedowitz 89efd96db6 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev 
am: 9dfac101f2

* commit '9dfac101f2c7c34992e0214c09ee34f20b396bb1':
  Revert "Add description strings for Unicode 8.0 new emoji."
 2015-11-10 03:30:33 +00:00
Ian Pedowitz e1d5012683 Revert "Unicode 8.0 emoji changes to Google Keyboard." 
This reverts commit 9cc42549d1.

Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
 2015-11-10 03:29:41 +00:00
Ian Pedowitz 9dfac101f2 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev 2015-11-10 03:29:13 +00:00
Ian Pedowitz 354d0092ac Revert "Add description strings for Unicode 8.0 new emoji." 
This reverts commit 332181b834.

Change-Id: Ic7c494292249f86159ec6f4bc1f7a72859b10282
 2015-11-10 03:05:40 +00:00
Reena Lee b2e58c5691 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev am: 9749f1f1c3 am: 2c56e60003 am: f25c8c6c6f 
am: 2521d1e485

* commit '2521d1e48518ba9a9cab1bb0de16e45a3c0514b3':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:52:32 +00:00
Reena Lee 2521d1e485 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev am: 9749f1f1c3 am: 2c56e60003 
am: f25c8c6c6f

* commit 'f25c8c6c6fa94cc6a1a5d8f04b490b78093b5c63':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:47:43 +00:00
Chieu Nguyen 9cfc333879 Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1 am: 72d0a185d9 am: 3ca694e58f 
am: 1ca322290a

* commit '1ca322290a421075fda219130ac26df8a1f2499e':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:47:25 +00:00
Reena Lee f25c8c6c6f Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev am: 9749f1f1c3 
am: 2c56e60003

* commit '2c56e600037bf48e64474d06cf491ca0347ff5fc':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:45:21 +00:00
Reena Lee 03fb74808b Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev 
am: 9749f1f1c3

* commit '9749f1f1c3755ece6ddfc822d642ac0e8218d138':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:42:28 +00:00
Reena Lee 2c56e60003 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev 
am: 9749f1f1c3

* commit '9749f1f1c3755ece6ddfc822d642ac0e8218d138':
  Add description strings for Unicode 8.0 new emoji.
 2015-11-09 21:42:26 +00:00
Chieu Nguyen 1ca322290a Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1 am: 72d0a185d9 
am: 3ca694e58f

* commit '3ca694e58fb7fd9c19ec9faf2ca9aebdf94853d1':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:40:37 +00:00
Reena Lee 9749f1f1c3 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev 2015-11-09 21:36:55 +00:00
Chieu Nguyen 3ca694e58f Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1 
am: 72d0a185d9

* commit '72d0a185d9227e8ec43ceb2bd0d3f9d7cc0f5c97':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:35:10 +00:00
Chieu Nguyen a6b06585fc Unicode 8.0 emoji changes to Google Keyboard. 
am: 9cc42549d1

* commit '9cc42549d18f1e28ffc8dae94ff36728933f53f1':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:30:07 +00:00
Chieu Nguyen 72d0a185d9 Unicode 8.0 emoji changes to Google Keyboard. 
am: 9cc42549d1

* commit '9cc42549d18f1e28ffc8dae94ff36728933f53f1':
  Unicode 8.0 emoji changes to Google Keyboard.
 2015-11-09 21:30:07 +00:00
Geoff Mendal c4f6affeec Merge "Import translations. DO NOT MERGE" 2015-11-09 14:10:06 +00:00
Geoff Mendal 350b3915db Import translations. DO NOT MERGE 
Change-Id: Ife64801ddf3bc0c56b95a473877221e2f03348fd
Auto-generated-cl: translation import
 2015-11-09 06:08:40 -08:00
Geoff Mendal 514aa601fb Import translations. DO NOT MERGE 
Change-Id: Id363ef4a6bed294e41b39a435eb29fcdf936bef6
Auto-generated-cl: translation import
 2015-11-09 06:05:47 -08:00
Chieu Nguyen 9cc42549d1 Unicode 8.0 emoji changes to Google Keyboard. 
Squashed commit of the following:

    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

Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
 2015-11-06 18:22:05 -08:00
Chieu Nguyen 332181b834 Add description strings for Unicode 8.0 new emoji. 
Bug: 16185905
Bug: 25369504

Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17
(cherry picked from commit 4a4a042072790b19048a14d2ddab655b1be31a6e)
 2015-11-06 01:08:50 +00:00
Baligh Uddin fa75c4598b Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6d380e0b7f -s ours 
am: b633b4acb6  -s ours

* commit 'b633b4acb627efc699593ab1e286a17e893ae82d':
  Import translations. DO NOT MERGE
 2015-11-05 19:52:56 +00:00
Baligh Uddin 59de7b8db0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cc7a3f79f2 -s ours 
am: 41f3a1698c  -s ours

* commit '41f3a1698c414063a59cdf5d21e56f80130d0ed4':
  Import translations. DO NOT MERGE
 2015-11-05 19:52:42 +00:00
Baligh Uddin 79a776f242 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6c71f54f82 -s ours 
am: d8b2e4e5bd  -s ours

* commit 'd8b2e4e5bd0294a2901b0c2e3f7b1f9fff62e47c':
  Import translations. DO NOT MERGE
 2015-11-05 19:52:27 +00:00
Baligh Uddin c0f37712f8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d2199b5f52 -s ours 
am: 2aa0dc6454  -s ours

* commit '2aa0dc64548c644a441cd89e490c1b0d755bf680':
  Import translations. DO NOT MERGE
 2015-11-05 19:52:13 +00:00