d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -07:00
d5c8247fe9
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0f018ab134e9d80ce71e93fb2462b481f3076fb0
2013-04-08 13:36:39 -07:00
9320b6def7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:08 -07:00
d0c383e147
am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
...
* commit '5a4949c28b594afe983d1c9163bbe0e71d200757':
Force inlining Correction::isSingleQuote
2013-04-04 12:17:12 -07:00
5a4949c28b
Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
2013-04-04 19:13:52 +00:00
c2fbd7c64d
Force inlining Correction::isSingleQuote
...
Also, only apply -Winline with GCC 4.6. There are some copy constructors
that GCC 4.7/4.8 fail to inline.
Change-Id: I97906045224e89377e8ea6add07a79fa088648af
2013-04-04 11:26:04 -07:00
144ff6b0d8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:56:07 -07:00
04915a76b4
am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'c33a0ab34327a48180e26011699468e358cab6b2':
2013-04-03 19:33:10 -07:00
51a474224b
am a631cede: Import translations. DO NOT MERGE
...
* commit 'a631cedeeed0dddf7b5b770335df5d30b14afba1':
Import translations. DO NOT MERGE
2013-04-03 19:33:08 -07:00
02dc06a894
am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '21484175789bd2c56c8f0f287149a02922fda2d0':
Import translations. DO NOT MERGE
2013-04-03 19:33:07 -07:00
d2a0c6145c
am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit 'b4e2a3bb4ededabce573e90fe0d82dda0fb2d8cb':
Change which backdoor the tests goes through
2013-04-03 19:33:06 -07:00
c840ec9eb7
am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
...
* commit '7cd0ffdde4f684e00c2f9805706ab9514e9733dd':
Fix a test.
2013-04-03 19:33:05 -07:00
64dd4754e3
am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit '63742fe53072a9a706c4bfc51dde00c5fbb9829a':
Move typing policy to AOSP
2013-04-03 19:33:04 -07:00
1bd8f332a9
am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit '6531bcdc82958463a94482acc37d0f23578bb662':
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-03 19:33:02 -07:00
6b29ef4624
am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit '558f41d4020a6714146dfd6f9508742c29ce9edd':
[DO NOT MERGE] Activate hardware keyboard handling
2013-04-03 19:33:01 -07:00
3547bd2932
am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
...
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
Split LogUnits differently.
2013-04-03 19:33:00 -07:00
2741e56d56
am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '0491706a533cde9b3f7e8e9fe3e81e0ac4ed4799':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
536e722033
am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '9bf7e74dc4b29978a92d96de5b404c20677a249c':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
3ec6a8bdf9
am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
...
* commit '6c522b53f0950fa511bf93e1e506434e7cdef6ad':
Reorder ResearchLogger call
2013-04-03 19:27:26 -07:00
19fe4d4b6b
am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit 'bfd7dcd5b2a44d0f1b9c67601fda55a56bae6736':
2013-04-03 19:27:24 -07:00
b1533116f5
am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit 'b08506c2211490fb42617f30dbd8901bf5651b47':
Interpolate gesture preview trails
2013-04-03 19:27:22 -07:00
91d468f5a0
am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit 'ac8703263d6ee3d9f34dac1d8ec9f128abbb2e4b':
Move policy and session to AOSP
2013-04-03 19:27:21 -07:00
873c20ba06
am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
...
* commit 'e40d5633659a401e1357e1c530238ed74cc158f6':
Ask the client to make itself known when it's not
2013-04-03 19:27:20 -07:00
3b9d7fd179
am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit '151e4e182c86a2b7aea534bda777e9e9aafa549b':
Fix two nasty bugs with surrogate pairs.
2013-04-03 19:27:19 -07:00
fdf3c49c8b
am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit 'bde25a4a6334f4120ec696c693ab9bf12ee979e4':
Move dicnode to AOSP
2013-04-03 19:27:18 -07:00
70616b635a
am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '08f5b7802a8e38bf17b4996460946e140b175e3b':
2013-04-03 19:27:17 -07:00
a9ef902cd8
am 70747ad6: am 97a3ce02: Merge "Refactor"
...
* commit '70747ad6c34851be522fc25247271a098b72034c':
Refactor
2013-04-03 19:27:15 -07:00
4c535232bc
am a38d907b: am 740da0d8: Fix an NPE
...
* commit 'a38d907b96882f41174d6cf7d0da6faefcc97228':
Fix an NPE
2013-04-03 19:27:15 -07:00
76c00decc9
am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '7580e9945ba096a2a084a6f571c2bd1a945dec8c':
Fix potential NPE in MainKeyboardView.KeyTimerHandler
2013-04-03 19:27:13 -07:00
86b8b7b407
am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
...
* commit '9bf1dfebd8e51fb16ac26c59de9aa646b4499765':
Fix an NPE
2013-04-03 19:27:12 -07:00
1c63efc975
am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit 'a657afc32e099d1b12516788e1a32d1303ced295':
Cleanup
2013-04-03 19:27:11 -07:00
05b7988a74
am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit '53698f8db8806d0d59610b5442c1c77736fdead9':
2013-04-03 19:27:10 -07:00
68a0afc3b9
am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
...
* commit '0c777365e4a1d8e8154836d4af0ad3d3e68e4c4a':
2013-04-03 19:27:08 -07:00
ea46fdcb7b
am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '65dfe94d56e48e1990db66d59cbbeddc31e270a7':
2013-04-03 19:27:07 -07:00
561a04f314
am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
...
* commit '1911c513a719b05eb4919eb944fcbf71a0a0d78e':
2013-04-03 19:27:06 -07:00
e01d1960a2
am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
...
* commit 'c17e0bbad19688d8b40da5b4ef5763e3af3ed999':
2013-04-03 19:27:05 -07:00
f4f4d6c939
am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
...
* commit 'b343817399d33e6f460d705bff3adb87cff91964':
2013-04-03 19:27:04 -07:00
49d59d4a9a
am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
...
* commit 'a469cdfe50ddeb188ad7dc203c6d187403609a6f':
2013-04-03 19:27:02 -07:00
4379dbea4a
am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
...
* commit '324b1880ab719dfdf08c401e28ccde3e6e552782':
2013-04-03 19:27:01 -07:00
67f7bb2e58
am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
...
* commit '284d428535d5902fa459640d4e465f15473eaa9c':
2013-04-03 19:27:00 -07:00
a62edb475d
am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
...
* commit '3d082f1bbfeaf396385ac0da5ad2834ee5ed4c27':
2013-04-03 19:26:58 -07:00
32d89afaf6
am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
...
* commit 'e2ccd61be43201c1bf49a88755034faba8a50323':
2013-04-03 19:26:57 -07:00
a5bc58accc
am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
...
* commit '5301db94f03ce61b9767a5781f396f879f617f56':
2013-04-03 19:26:56 -07:00
772dfa51de
am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'ae8b69fd101b19e77b3f1f545f893576a56cb475':
2013-04-03 19:26:55 -07:00
92adcda676
am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '42c255c2b6793cd1f517951dd854f17ec27bd1e9':
2013-04-03 19:26:54 -07:00
8e5fa88a00
am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit 'f518e71ad276678ef891fe7819b6ca9376609190':
2013-04-03 19:21:20 -07:00
33c91be35a
am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
...
* commit '40be0244bd15c41a3eff33f00108e84c626ad13b':
2013-04-03 19:21:18 -07:00
e0aa938339
am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
...
* commit 'a7353ddac8bd206501714a72c62c15c5a8f8f3c7':
2013-04-03 19:21:17 -07:00
4e627c214d
am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
...
* commit '56796cd76efe9fa63b62cd075725b4d754eb430c':
2013-04-03 19:21:16 -07:00
5d33d2c2d8
am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
...
* commit '9b969b261cdb57f6c17154742be03a2b617ad41d':
2013-04-03 19:21:15 -07:00
Jean-Baptiste Queru
The Android Open Source Project
The Android Automerger
Ben Cheng
Baligh Uddin
Jean Chalard
Satoshi Kataoka
Kurt Partridge
Tadashi G. Takaoka
Alan Viverette