Commit graph

33717 commits

Author SHA1 Message Date
Keisuke Kuroyanagi
6c627db6b6 am 862fa431: am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
* commit '862fa431df2174f2d45045353cdcf29e508dbd15':
  Add BufferWithExtendablebufferTest
2014-07-25 02:03:59 +00:00
Keisuke Kuroyanagi
e127672661 am 917f8002: am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
* commit '917f8002c0eb310da517ec97b235fada60978996':
  Add BufferWithExtendableBuffer::extend()
2014-07-25 02:03:58 +00:00
Keisuke Kuroyanagi
6bd15b8662 am e32cb6f8: am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
* commit 'e32cb6f8f267ce044c2880106e5a5a309ec9dc33':
  Refactoring checkAndPrepareWriting.
2014-07-25 02:03:56 +00:00
Keisuke Kuroyanagi
862fa431df am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
  Add BufferWithExtendablebufferTest
2014-07-24 23:59:07 +00:00
Keisuke Kuroyanagi
917f8002c0 am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
  Add BufferWithExtendableBuffer::extend()
2014-07-24 23:59:06 +00:00
Keisuke Kuroyanagi
e32cb6f8f2 am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
  Refactoring checkAndPrepareWriting.
2014-07-24 23:59:05 +00:00
Keisuke Kuroyanagi
370ffb424f am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
* commit '825243bfdd6fb63c2ef8bf99024bb06e6f52e946':
  Add BufferWithExtendablebufferTest
2014-07-24 23:37:03 +00:00
Keisuke Kuroyanagi
90ac50ee43 am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
* commit 'dfbe2a8ca80ef73a0bc1364cf5964db2141a2a86':
  Add BufferWithExtendableBuffer::extend()
2014-07-24 23:36:16 +00:00
Keisuke Kuroyanagi
16665da280 am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
* commit 'f78eb27c7e563d0bbe10239ec7d9941fd170e597':
  Refactoring checkAndPrepareWriting.
2014-07-24 23:35:45 +00:00
Tim Murray
5d44dfe005 am ea3bc5ca: am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
  Use default compiler flags for dicttool.
2014-07-24 21:27:56 +00:00
Tim Murray
ea3bc5caac am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
  Use default compiler flags for dicttool.
2014-07-24 21:25:56 +00:00
Tim Murray
da9cc77339 resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Stephen Hines
ed40eac86a am 578c6311: am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
* commit '578c6311548e3f85e6b8c8800a66eb252e6b42f7':
  Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:08:29 +00:00
Tadashi G. Takaoka
9a3905beca am 456cc996: am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly
* commit '456cc9967831337c759ae2ba9c6a5621ef776110':
  Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:08:27 +00:00
Stephen Hines
578c631154 am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
* commit '5a289ed29345e545742bc33728d7010b5e2c1e65':
  Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:01:01 +00:00
Tadashi G. Takaoka
456cc99678 am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
  Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:01:00 +00:00
Keisuke Kuroyanagi
825243bfdd Merge "Add BufferWithExtendablebufferTest" into lmp-dev 2014-07-24 15:37:54 +00:00
Keisuke Kuroyanagi
d4c9d50ef0 Add BufferWithExtendablebufferTest
Bug: 13754552
Change-Id: Ib9c330dc85bdb5d4d3d5bc15cc3ce5f28faa0b12
2014-07-25 07:02:10 +09:00
Keisuke Kuroyanagi
ff6ca09905 Add BufferWithExtendableBuffer::extend()
Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3
2014-07-25 07:02:05 +09:00
Keisuke Kuroyanagi
dfbe2a8ca8 Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev 2014-07-24 15:35:58 +00:00
Keisuke Kuroyanagi
f78eb27c7e Merge "Refactoring checkAndPrepareWriting." into lmp-dev 2014-07-24 15:35:58 +00:00
Stephen Hines
5a289ed293 Revert "Revert "Revert "Use mclinker"""
This reverts commit b48c93b3fc.

MCLinker is not a valid option for clang 3.5.
2014-07-23 19:58:17 -07:00
Keisuke Kuroyanagi
6810e8df1e Refactoring checkAndPrepareWriting.
Bug: 14425059
Change-Id: I98940f3841a6c61b0482440b4da21f415dc843f6
2014-07-24 10:24:42 +09:00
Tadashi G. Takaoka
a270ac4a61 Remove unnecessary DebugSettingsActivity, use fragment directly
This CL must be checked in together with I1db2e848ab.

Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Tim Murray
159474f2ae Merge "Use default compiler flags for dicttool." 2014-07-23 18:45:08 +00:00
Tim Murray
dd28478f5c Use default compiler flags for dicttool.
Not using this causes the triple to not be passed to clang, breaking Darwin.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-23 21:44:25 -07:00
Baligh Uddin
ba8f6e0bcb am 129f0586: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '129f05867fc881aca96c21ae2b8aac7ae0440c42':
  Import translations. DO NOT MERGE
2014-07-22 17:48:27 +00:00
Baligh Uddin
3e8d3e85ea am 9f147c13: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '9f147c1337feaf0d3903381c4ccd0ce8995ac201':
  Import translations. DO NOT MERGE
2014-07-22 17:48:26 +00:00
Baligh Uddin
47e39a8e61 am f1e3f9df: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'f1e3f9df51157435e9fa87b4fe243fac3a71ab42':
  Import translations. DO NOT MERGE
2014-07-22 17:48:25 +00:00
Baligh Uddin
816b238ade am 05a2e8de: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '05a2e8dea5cc839473e116bcd328370e9a02e54f':
  Import translations. DO NOT MERGE
2014-07-22 17:48:23 +00:00
Baligh Uddin
5ccc7c664f am f9efaad4: (-s ours) Import translations. DO NOT MERGE
* commit 'f9efaad468c72df362f79bb3fc542b64aeb4d0bc':
  Import translations. DO NOT MERGE
2014-07-22 17:48:22 +00:00
Baligh Uddin
f9efaad468 Import translations. DO NOT MERGE
Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500
Auto-generated-cl: translation import
2014-07-22 17:44:19 +00:00
Baligh Uddin
58ad6c4805 Import translations. DO NOT MERGE
Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6
Auto-generated-cl: translation import
2014-07-22 17:39:41 +00:00
Baligh Uddin
f1e3f9df51 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:29:55 +00:00
Baligh Uddin
c1d2124a3e Import translations. DO NOT MERGE
Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5
Auto-generated-cl: translation import
2014-07-22 17:44:08 +00:00
Baligh Uddin
129f05867f Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
8fc6b5a820 Import translations. DO NOT MERGE
Change-Id: I8916526987bd2008b85222124bf465114e4d592c
Auto-generated-cl: translation import
2014-07-22 17:43:50 +00:00
Baligh Uddin
9f147c1337 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
e13e675cdc Import translations. DO NOT MERGE
Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a
Auto-generated-cl: translation import
2014-07-22 17:44:02 +00:00
Baligh Uddin
05a2e8dea5 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
ef29c1cd61 Import translations. DO NOT MERGE
Change-Id: I844a25e74c1cd451523248ae0d09ba9d40c3d09d
Auto-generated-cl: translation import
2014-07-22 17:44:14 +00:00
Baligh Uddin
e466494aa4 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-07-22 16:21:19 +00:00
Baligh Uddin
3d2d4280c0 Import translations. DO NOT MERGE
Change-Id: Ie5e463b792381613105191536f50f20a05a76916
Auto-generated-cl: translation import
2014-07-22 17:43:56 +00:00
Baligh Uddin
d700afb9f1 am 58ad6c48: (-s ours) Import translations. DO NOT MERGE
* commit '58ad6c4805c56b00f9d0bcaacb523d86912b647b':
  Import translations. DO NOT MERGE
2014-07-22 17:43:52 +00:00
Yohei Yukawa
ec626d4bfe am e2ceff04: am 3f513f10: Enable InputMethodService#onUpdateCursor behind the flag
* commit 'e2ceff04582791af2d25facfa5124b44ea95de3b':
  Enable InputMethodService#onUpdateCursor behind the flag
2014-07-21 18:37:30 +00:00
Yohei Yukawa
d8f522b6ce am 4deb5dc9: am 6b14bbf1: Fix build breakage in dicttool
* commit '4deb5dc9a209b2e2ce9847a144f3f84008ea3d53':
  Fix build breakage in dicttool
2014-07-21 18:37:29 +00:00
Yohei Yukawa
14ee576911 am 21036c27: am 91e7daad: Merge "Use CharSequence for spell checker to keep spans preserved" into lmp-dev
* commit '21036c277648bf43b40295dc0da6972354f57b57':
  Use CharSequence for spell checker to keep spans preserved
2014-07-21 18:37:28 +00:00
Baligh Uddin
de339deb7f am 1dbbd557: (-s ours) am 8279b9d4: (-s ours) Remove deprecated locales - DO NOT MERGE
* commit '1dbbd557112d67768bbda49ece657554bb2be3c7':
  Remove deprecated locales - DO NOT MERGE
2014-07-21 18:37:26 +00:00
Yohei Yukawa
9a9893d1a2 am 080eba65: am 22ba22f3: Merge "Add two convenient utility methods for L new API" into lmp-dev
* commit '080eba652d2aba82d8b86a84a166529ca9303714':
  Add two convenient utility methods for L new API
2014-07-21 18:37:25 +00:00
Tadashi G. Takaoka
86b59df23c am ec8d08af: am 34da7494: Merge "Update Hindi Compact keyboard layout" into lmp-dev
* commit 'ec8d08af28a598ab0321ffdb7aa302d95a99ec55':
  Update Hindi Compact keyboard layout
2014-07-21 18:37:24 +00:00