Commit Graph

28806 Commits (90b948ea0f90b7fa9580215990efece69b63928b)

Author SHA1 Message Date
Ying Wang 90b948ea0f am b25404ec: Merge "Use LOCAL_MULTILIB to build host lib as 64-bit"
* commit 'b25404ec419e82e8f8b4f3b80d04708d39d9b7ad':
  Use LOCAL_MULTILIB to build host lib as 64-bit
2014-06-10 16:47:55 +00:00
Ying Wang b25404ec41 Merge "Use LOCAL_MULTILIB to build host lib as 64-bit" 2014-06-10 16:26:58 +00:00
Ying Wang fb57fe263c Use LOCAL_MULTILIB to build host lib as 64-bit
Also we should use LOCAL_REQUIRED_MODULES instead of
LOCAL_ADDITIONAL_DEPENDENCIES.

Bug: 13751317
Change-Id: I742ff14b3de168e14e646749cf4f6bc9c9e7bc62
2014-06-09 12:16:30 -07:00
Bill Yi 8ce65243e7 am 2debf168: Merge commit \'5df8b42709662b0e599019e4fd17c4e153ff6b47\' into HEAD
* commit '2debf168920bb852b1583446fc336743f98b3c04':
2014-04-30 00:59:56 +00:00
Bill Yi 2debf16892 Merge commit '5df8b42709662b0e599019e4fd17c4e153ff6b47' into HEAD 2014-04-29 11:34:28 -07:00
Ying Wang f2a10900d4 am 5c36065b: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
* commit '5c36065b74852857b3cc520d7be5df9413937cd9':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
2014-04-19 00:05:10 +00:00
Ying Wang 5c36065b74 Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build." 2014-04-18 23:57:15 +00:00
Ying Wang 5833a06c95 Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Change-Id: Ib45416aec46d9cc574d34de96d18219643334beb
2014-04-18 16:45:41 -07:00
Baligh Uddin 0f591c64ff am beaa8a47: (-s ours) am 5df8b427: (-s ours) am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'beaa8a473ff0f9f2f2d93d25a34e880007062f53':
  Import translations. DO NOT MERGE
2014-02-21 17:03:23 +00:00
Baligh Uddin b4b0e65ed8 am b76ca05f: (-s ours) am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b76ca05fef52f48db02de46c4ef15348e554fff4':
  Import translations. DO NOT MERGE
2014-02-21 17:03:22 +00:00
Baligh Uddin 40193c9ee5 am 5c2e47ab: (-s ours) am 786190c2: (-s ours) am e1c66c8d: (-s ours) am 80dc4248: (-s ours) Import translations. DO NOT MERGE
* commit '5c2e47abc014a6f20f2074b970c0288f404b8ef4':
  Import translations. DO NOT MERGE
2014-02-21 17:03:21 +00:00
Baligh Uddin beaa8a473f am 5df8b427: (-s ours) am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5df8b42709662b0e599019e4fd17c4e153ff6b47':
  Import translations. DO NOT MERGE
2014-02-21 16:58:00 +00:00
Baligh Uddin b76ca05fef am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'fb52c953ac98cd7751a6d49cedf99eefcf86e70f':
  Import translations. DO NOT MERGE
2014-02-21 16:57:59 +00:00
Baligh Uddin 5c2e47abc0 am 786190c2: (-s ours) am e1c66c8d: (-s ours) am 80dc4248: (-s ours) Import translations. DO NOT MERGE
* commit '786190c2237a38ca997ef0966cabeb8c271455d2':
  Import translations. DO NOT MERGE
2014-02-21 16:57:57 +00:00
Baligh Uddin 5df8b42709 am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'aa8f178b4a8c557d553a7bfd27a22439b0465756':
  Import translations. DO NOT MERGE
2014-02-21 16:52:51 +00:00
Baligh Uddin fb52c953ac am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4b9936d302679369d6ec912bfd248366afafbe85':
  Import translations. DO NOT MERGE
2014-02-21 16:52:50 +00:00
Baligh Uddin 786190c223 am e1c66c8d: (-s ours) am 80dc4248: (-s ours) Import translations. DO NOT MERGE
* commit 'e1c66c8ddb26ffe5361949b9e6b82f802bb6a671':
  Import translations. DO NOT MERGE
2014-02-21 16:52:49 +00:00
Baligh Uddin aa8f178b4a am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'cd2a75b5c47a71f665e8f2020ead8b98dd418373':
  Import translations. DO NOT MERGE
2014-02-21 16:46:34 +00:00
Baligh Uddin 4b9936d302 am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '801517fe752f5352023bf4da8f3bb22727529963':
  Import translations. DO NOT MERGE
2014-02-21 16:46:32 +00:00
Baligh Uddin e1c66c8ddb am 80dc4248: (-s ours) Import translations. DO NOT MERGE
* commit '80dc4248546755f6a117ba28e14eeab05d7e1596':
  Import translations. DO NOT MERGE
2014-02-21 16:46:30 +00:00
Baligh Uddin cd2a75b5c4 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-21 16:42:07 +00:00
Baligh Uddin 801517fe75 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-21 16:42:00 +00:00
Baligh Uddin 80dc424854 Import translations. DO NOT MERGE
Change-Id: I2e9650644e214864cf8b6126d635fbf6790a7652
Auto-generated-cl: translation import
2014-02-21 02:19:13 -08:00
Baligh Uddin 6b76a61223 Import translations. DO NOT MERGE
Change-Id: I70333e4c46801d5ff8fdbeaabb5b09642146b60e
Auto-generated-cl: translation import
2014-02-21 02:16:01 -08:00
Baligh Uddin 89a82404da Import translations. DO NOT MERGE
Change-Id: I36ae3ddd02a99ec044e1fd0fdf88d8e7726bdd17
Auto-generated-cl: translation import
2014-02-21 02:14:33 -08:00
Baligh Uddin dd003a71a7 am 489fc1c5: (-s ours) am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
* commit '489fc1c58a696247b8d7525cd0869be9224e5412':
  Import translations. DO NOT MERGE
2014-01-07 18:24:56 +00:00
Baligh Uddin 489fc1c58a am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
* commit '17b06650f17f674bb039e8937737a76cafa32e61':
  Import translations. DO NOT MERGE
2014-01-07 18:21:50 +00:00
Baligh Uddin 17b06650f1 am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
* commit 'bbba6d79b6eda0dc1ad05c679fc9e7f9df313bf6':
  Import translations. DO NOT MERGE
2014-01-07 10:18:50 -08:00
Baligh Uddin bbba6d79b6 am 184e4d14: (-s ours) Import translations. DO NOT MERGE
* commit '184e4d14643e802e49ebbf6f533047d7cf27f2d5':
  Import translations. DO NOT MERGE
2014-01-07 10:15:45 -08:00
Baligh Uddin 184e4d1464 Import translations. DO NOT MERGE
Change-Id: I3e0560396e087669ff484b6c15d0f0eb03c02de5
Auto-generated-cl: translation import
2014-01-07 07:26:33 -08:00
Baligh Uddin f21776a861 am 0c51ffa1: (-s ours) am 4489366f: (-s ours) am f68bc8b3: (-s ours) am ae5d7faa: (-s ours) Import translations. DO NOT MERGE
* commit '0c51ffa115dbd2e291979bb79635fd4ccd2edad9':
  Import translations. DO NOT MERGE
2013-12-17 17:56:39 +00:00
Baligh Uddin 0c51ffa115 am 4489366f: (-s ours) am f68bc8b3: (-s ours) am ae5d7faa: (-s ours) Import translations. DO NOT MERGE
* commit '4489366f8eb614e3651c5c0e135e7aa4b817d106':
  Import translations. DO NOT MERGE
2013-12-17 17:53:38 +00:00
Baligh Uddin 4489366f8e am f68bc8b3: (-s ours) am ae5d7faa: (-s ours) Import translations. DO NOT MERGE
* commit 'f68bc8b32b32ada0e6cbd519caf21564ebad224d':
  Import translations. DO NOT MERGE
2013-12-17 09:51:35 -08:00
Baligh Uddin f68bc8b32b am ae5d7faa: (-s ours) Import translations. DO NOT MERGE
* commit 'ae5d7faa681e4112c1044d47aa227a839886c402':
  Import translations. DO NOT MERGE
2013-12-17 09:48:55 -08:00
Baligh Uddin ae5d7faa68 Import translations. DO NOT MERGE
Change-Id: Ie0909f0fd0dddd5ced863fd50c808a0199f9431a
Auto-generated-cl: translation import
2013-12-16 17:36:27 -08:00
Baligh Uddin 5e11efa515 keep history after reset to klp-volantis-dev 2013-12-12 20:07:33 -08:00
Baligh Uddin e60d947c1f keep history after reset to klp-dev-plus-aosp 2013-12-12 20:00:43 -08:00
Baligh Uddin 847d956c70 keep history after reset to klp-ub-dev 2013-12-12 19:42:49 -08:00
Satoshi Kataoka 1c4180a846 am 963aadee: am 23436291: am f81c2274: am 8156a450: am 56997a80: Retry to tweak punctuations
* commit '963aadeebf044a11d36aed08a1d5a4ca1ad0a033':
  Retry to tweak punctuations
2013-12-13 02:26:48 +00:00
Satoshi Kataoka fcbaf94cc2 am 6d95ca39: am fa26d892: am fb7f2750: am afe143c9: am 30ef03d8: Tweak vertical gap of Emoji palette
* commit '6d95ca39b848bea049adde98fe313a1c4a8ebbe6':
  Tweak vertical gap of Emoji palette
2013-12-13 02:26:45 +00:00
Satoshi Kataoka ff5c7248a5 am cb864c55: am fb29ca21: am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit 'cb864c5501eca57b04fd108ff98201216f22904f':
  Fix the security related API change for PreferenceActivity
2013-12-13 02:26:43 +00:00
Jean Chalard de11456a88 am 71ed917a: am 817bed54: am e027ac9f: am a8285a24: am dfaec345: Merge "Always call finishComposingText before recapitalization"
* commit '71ed917abc2dbe18e0460f3782c3e6fe4b2a3c4f':
  Always call finishComposingText before recapitalization
2013-12-13 02:26:40 +00:00
Jean Chalard bd2b534088 am 691207d1: am e0e7c42e: am 416b5e83: am bfa0d8df: am e306d292: Merge "Remove a useless IPC call."
* commit '691207d1bbcb557d5ad7a376d9032aea8df579e4':
  Remove a useless IPC call.
2013-12-13 02:26:38 +00:00
Satoshi Kataoka 2a4aa33ca9 am 8c79bfd7: am ccbe8873: am faf999f8: am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils
* commit '8c79bfd7d71600fca11910cb00ca42a7244b6740':
  Fix crash in AdditionalSubtypeUtils
2013-12-13 02:26:35 +00:00
Baligh Uddin 2f4ab417d7 am ff662e8e: (-s ours) am 04b312f1: (-s ours) am 5c47cee0: (-s ours) am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'ff662e8e6a6a451d46f454ee554f9c4746737892':
  Import translations. DO NOT MERGE
2013-12-13 02:26:27 +00:00
Baligh Uddin 1ced4f23ba am b4f72d88: (-s ours) am 7256b614: (-s ours) am 7139cc38: (-s ours) am 549559e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'b4f72d8862bf1b2ecbe1cfbba69f25f866d222b8':
  Import translations. DO NOT MERGE
2013-12-13 02:26:25 +00:00
Satoshi Kataoka 963aadeebf am 23436291: am f81c2274: am 8156a450: am 56997a80: Retry to tweak punctuations
* commit '234362915ea970adf3566f795e7f8877d7babec0':
  Retry to tweak punctuations
2013-12-13 02:20:34 +00:00
Satoshi Kataoka 6d95ca39b8 am fa26d892: am fb7f2750: am afe143c9: am 30ef03d8: Tweak vertical gap of Emoji palette
* commit 'fa26d8928292ce3a87c08dc1d6ae5b8e87863249':
  Tweak vertical gap of Emoji palette
2013-12-13 02:20:32 +00:00
Satoshi Kataoka cb864c5501 am fb29ca21: am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit 'fb29ca21002c99986899705fad439037d7b91f56':
  Fix the security related API change for PreferenceActivity
2013-12-13 02:20:30 +00:00
Jean Chalard 71ed917abc am 817bed54: am e027ac9f: am a8285a24: am dfaec345: Merge "Always call finishComposingText before recapitalization"
* commit '817bed5440034ab943a0789dd3f54e5eaf87bcab':
  Always call finishComposingText before recapitalization
2013-12-13 02:20:28 +00:00