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
3b8d54bf1d
am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '08a5e43d6168cc0364a99c5bb449c73a376adb50':
2013-04-03 19:34:19 -07:00
2b3f12897e
am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit '06c1baba5437e69c761bd923ac3852d64a73c311':
2013-04-03 19:34:18 -07:00
cb4ae59c80
am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit 'bb229fe173b6e14edde81eaf3fa2eb0d48c1842a':
2013-04-03 19:34:17 -07:00
ed66b23231
am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
...
* commit 'cffac3218f7afca9faad3aa5a3bafbda38777bb6':
2013-04-03 19:34:15 -07:00
76dda67548
am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit 'c821c723b8ce71044e4b93ed73494e32fbcbf584':
2013-04-03 19:34:14 -07:00
8348fe8a09
am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit '6f7494e61542036e28514fafad4f839c65ebe447':
2013-04-03 19:34:13 -07:00
38a9f856e5
am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '228fcdae71f8bf4d2c3ed1e4eea068782971001a':
2013-04-03 19:34:12 -07:00
7a3bc77b41
am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
...
* commit 'b980adabe2d488071359f80aa7fa4a31e38f519f':
2013-04-03 19:34:10 -07:00
126336be8e
am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
...
* commit '3effa52016870d18c85b468034bc385df07bbbf3':
2013-04-03 19:34:09 -07:00
1b7451af76
am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '57a7a5c33eeba73cb0e0e6c7871e2f94956fbcbd':
2013-04-03 19:34:08 -07:00
db993a5fe4
am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
...
* commit 'ae97a93ab3d585ff4cdee4121686a90e0b5b0934':
2013-04-03 19:34:06 -07:00
bb94c6430b
am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit '5b2485901b5fff6c63d846e27af7a80ab183d6f3':
2013-04-03 19:34:05 -07:00
ca8ea43197
am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'a3ed3254a7aec469b4e902ef4fc78d4194bb17b3':
2013-04-03 19:34:04 -07:00
94065faf7d
am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c66608308ddcca599b0ad739e3ba46a096bf1871':
2013-04-03 19:34:03 -07:00
ccc3c23238
am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '228e26f7c72a9642b20fb35000aa5204a51eedaf':
2013-04-03 19:34:01 -07:00
b58432221c
am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
...
* commit '62b07bf948e01c6490fe2a639b9f8987bd0fd29a':
2013-04-03 19:34:00 -07:00
9c59fb54e5
am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
...
* commit 'fc0fc52122b155a13aaae7803390cc4b0b5b0a45':
2013-04-03 19:33:59 -07:00
71f1b27097
am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
...
* commit '8138c8d21ff69a65059b7a53b717e9b6630e68c3':
2013-04-03 19:33:58 -07:00
5283b90ae3
am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
...
* commit '60083e3e90b99257b1c88b76c8514d7ec4eca804':
2013-04-03 19:33:56 -07:00
6626fb255b
am 51c7dbea: (-s ours) am 4379dbea: 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 '51c7dbea68bb84006728ee6c5d3ba9df85ce277d':
2013-04-03 19:33:55 -07:00
1e8d1f418f
am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd72347f919620292274f2d543261fc78b6e82d0f':
2013-04-03 19:33:54 -07:00
38f2bbb392
am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
...
* commit '210d473d53971a2cf897b8951f1dc27881ad7545':
2013-04-03 19:33:53 -07:00
5eb7a00e4e
am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
...
* commit '1047bf17a7e80c451432e24128a7b7d718ca450f':
2013-04-03 19:33:51 -07:00
9768703147
am 0ad31c8d: (-s ours) am a5bc58ac: 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 '0ad31c8dc8cfda027a92b194b18fed65db7292ab':
2013-04-03 19:33:50 -07:00
3a97d38816
am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '273a21ca53f65ed562c82f3be2c90e4766b867ae':
2013-04-03 19:33:49 -07:00
9f291d17c6
am 2f8e381b: (-s ours) am 92adcda6: 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 '2f8e381be049ee1084fda06d3b1385d098e60bf3':
2013-04-03 19:33:47 -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
08a5e43d61
am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '19fe4d4b6b6a39d1c66d696b63aa272cb707187e':
2013-04-03 19:31:36 -07:00
06c1baba54
am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit 'b1533116f5c88a452cbf4d0573955f2d7e7ed060':
2013-04-03 19:31:35 -07:00
bb229fe173
am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit '91d468f5a09df4c651fb9eeed597e634b5607983':
2013-04-03 19:31:34 -07:00
cffac3218f
am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
...
* commit '873c20ba06f8d1067be8cde3b698e0ece9cfd98f':
2013-04-03 19:31:32 -07:00
c821c723b8
am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit '3b9d7fd1792da09c1d436eceb49ee4ea6bc47f07':
2013-04-03 19:31:31 -07:00
6f7494e615
am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit 'fdf3c49c8bd4d4b444d018e5ec8a94a5e1d3ba32':
2013-04-03 19:31:30 -07:00
Jean-Baptiste Queru
The Android Open Source Project
The Android Automerger
Ben Cheng
Jean Chalard
Tadashi G. Takaoka
Satoshi Kataoka
Baligh Uddin
Kurt Partridge