The Android Open Source Project
|
b35915fb50
|
Reconcile with jb-mr2-release - do not merge
Change-Id: Iba9f399b20d62611002d4353e00355b2550dbb1d
|
2013-03-29 09:49:25 -07:00 |
Satoshi Kataoka
|
70747ad6c3
|
am 97a3ce02: Merge "Refactor"
* commit '97a3ce022c4f158712fb803f7acd0151719b336e':
Refactor
|
2013-03-29 03:59:59 -07:00 |
|
Satoshi Kataoka
|
97a3ce022c
|
Merge "Refactor"
|
2013-03-29 10:57:45 +00:00 |
Jean Chalard
|
a38d907b96
|
am 740da0d8: Fix an NPE
* commit '740da0d8d0b29297fba75f4b63ccff28fc1f4a14':
Fix an NPE
|
2013-03-29 03:56:43 -07:00 |
|
Satoshi Kataoka
|
394b0bd345
|
Refactor
Change-Id: Ie50fdd1081d306e520300245498a605e79e03818
|
2013-03-29 18:49:50 +09:00 |
|
Jean Chalard
|
740da0d8d0
|
Fix an NPE
Also remove an unused method and make 2 private variables
final.
Bug: 8461093
Change-Id: I676d93fda28e82eb5a6978f2e7ad5a0add2cbecf
|
2013-03-29 18:41:29 +09:00 |
The Android Automerger
|
0574e46c73
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-03-28 05:56:26 -07:00 |
Tadashi G. Takaoka
|
7580e9945b
|
am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '48d8d8d0ae573605f938b3859bf58e1972f0d737':
Fix potential NPE in MainKeyboardView.KeyTimerHandler
|
2013-03-28 02:26:34 -07:00 |
|
Tadashi G. Takaoka
|
48d8d8d0ae
|
Fix potential NPE in MainKeyboardView.KeyTimerHandler
Bug: 8469652
Change-Id: Ib7a548e6a24d2e02de85ab444c0ec99d8f6b82c3
|
2013-03-28 17:54:36 +09:00 |
|
Jean Chalard
|
9bf1dfebd8
|
am 2188cbae: Merge "Fix an NPE"
* commit '2188cbae6351ae463f8b882b1cb6b1b348fad0a2':
Fix an NPE
|
2013-03-27 23:58:50 -07:00 |
|
Jean Chalard
|
2188cbae63
|
Merge "Fix an NPE"
|
2013-03-28 06:56:49 +00:00 |
|
Jean Chalard
|
a657afc32e
|
am d555a0d7: Merge "Cleanup"
* commit 'd555a0d77a02e4125b51f583492be9ba55674b03':
Cleanup
|
2013-03-27 23:18:04 -07:00 |
|
Jean Chalard
|
d555a0d77a
|
Merge "Cleanup"
|
2013-03-28 06:16:40 +00:00 |
|
Jean Chalard
|
28d5f4577f
|
Fix an NPE
The code was passing the wrong parameter.
Bug: 8492879
Change-Id: I091d62ca29601e3807eed287c7bdad38bf43a502
|
2013-03-28 15:08:05 +09:00 |
|
Jean Chalard
|
dae90cfb01
|
Cleanup
Seems there was an unclosed cursor :o
Change-Id: I7616849ace5217d8c6f54465f7b3a634e3c14116
|
2013-03-28 14:43:32 +09:00 |
Baligh Uddin
|
53698f8db8
|
am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'fd0e40ef91aad767a8de9e28ede35e792546bb8e':
|
2013-03-27 22:11:34 -07:00 |
|
Baligh Uddin
|
0c777365e4
|
am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'fbb6500d7d2933026c35c89f5a4e7f99a9e2f7ec':
Import translations. DO NOT MERGE
|
2013-03-27 22:11:33 -07:00 |
|
Baligh Uddin
|
fd0e40ef91
|
am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '78b07d8b574fe2d1a43e796775b89b116f8f411f':
|
2013-03-27 22:09:51 -07:00 |
|
Baligh Uddin
|
fbb6500d7d
|
am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit '5bcbc21a59043f73a30380cf3c231104d65921f9':
Import translations. DO NOT MERGE
|
2013-03-27 22:09:49 -07:00 |
|
Baligh Uddin
|
78b07d8b57
|
am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '0cd02c2bd732383766099aa2ec94abc8a8ac174a':
|
2013-03-27 22:05:16 -07:00 |
|
Baligh Uddin
|
5bcbc21a59
|
am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'c08b8245d92107f7300267e3d04ff302dfdb4281':
Import translations. DO NOT MERGE
|
2013-03-27 22:05:16 -07:00 |
|
The Android Automerger
|
65dfe94d56
|
am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '1237c8722bf66a581fd61fbd8721589f37fa1ef7':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-03-27 22:04:04 -07:00 |
|
Tadashi G. Takaoka
|
1911c513a7
|
am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit 'abd22393022fd744e07627e6c14051c1ff291837':
|
2013-03-27 22:04:03 -07:00 |
|
Tadashi G. Takaoka
|
c17e0bbad1
|
am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '830a8cbb08284b77449d76f763553f895f7a84e5':
|
2013-03-27 22:04:02 -07:00 |
|
Satoshi Kataoka
|
b343817399
|
am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'd3c823c16100b0f24d64c99c2e8fbdd747e475ed':
|
2013-03-27 22:04:00 -07:00 |
|
Tadashi G. Takaoka
|
a469cdfe50
|
am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit 'd0495a354fdcf28c69853ec7ae02a6799a44dcbb':
|
2013-03-27 22:03:59 -07:00 |
|
Baligh Uddin
|
324b1880ab
|
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 'f0213d1afee7aba909ca8ad0c29d0d0c9aa08212':
|
2013-03-27 22:03:58 -07:00 |
|
Baligh Uddin
|
284d428535
|
am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit 'f0346d70793f2bc4c479d48b7f45138741f91c58':
|
2013-03-27 22:03:57 -07:00 |
|
Baligh Uddin
|
3d082f1bbf
|
am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '14ef11a8a3d816855b68ecf4cd1f2ef3219e7154':
|
2013-03-27 22:03:56 -07:00 |
|
Tadashi G. Takaoka
|
e2ccd61be4
|
am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '2b04e787ac62fa52ce3ab71b755d07c6604fb0ee':
|
2013-03-27 22:03:55 -07:00 |
|
Baligh Uddin
|
5301db94f0
|
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 'e67698be3af031bd5efe8b94971d28c18d505460':
|
2013-03-27 22:03:53 -07:00 |
|
Baligh Uddin
|
ae8b69fd10
|
am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '7ea45c07558e2fe86a376e76a25c238cd7be06ce':
|
2013-03-27 22:03:52 -07:00 |
|
Baligh Uddin
|
42c255c2b6
|
am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '599290d53f110c0f6bba91696db0709e10dc1221':
|
2013-03-27 22:03:51 -07:00 |
|
The Android Automerger
|
1237c8722b
|
am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'a02de1f71d8f7a0dff87c573f3dc2e8a06b0728b':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-03-27 22:01:16 -07:00 |
|
Tadashi G. Takaoka
|
abd2239302
|
am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '8b120b985e62fbced7f31283c0585fbd4e3bb662':
|
2013-03-27 22:01:15 -07:00 |
|
Tadashi G. Takaoka
|
830a8cbb08
|
am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '33fa6a0b3bde25daabf330d152e9d400db42970e':
|
2013-03-27 22:01:14 -07:00 |
|
Satoshi Kataoka
|
d3c823c161
|
am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'dd8ca1f821c4f64f561e1d1badcfa5deb13de96d':
|
2013-03-27 22:01:12 -07:00 |
|
Tadashi G. Takaoka
|
d0495a354f
|
am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '56b1bd866a97b4662401ff98c287c56f4f26432a':
|
2013-03-27 22:01:11 -07:00 |
|
Baligh Uddin
|
f0213d1afe
|
am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit 'c1cb476697a3d063997996e98d7c670d53e7910f':
|
2013-03-27 22:01:09 -07:00 |
|
Baligh Uddin
|
f0346d7079
|
am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit 'fc135df5840a30eb99c9253d1394549fc192047e':
|
2013-03-27 22:01:08 -07:00 |
|
Baligh Uddin
|
14ef11a8a3
|
am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '93c5c7a41dd7715466cb6fe54533758578cd8b1f':
Import translations. DO NOT MERGE
|
2013-03-27 22:01:07 -07:00 |
|
Tadashi G. Takaoka
|
2b04e787ac
|
am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '71fb8af7c55f6821bf190261e29728e51e895266':
|
2013-03-27 22:01:06 -07:00 |
|
Baligh Uddin
|
e67698be3a
|
am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '8051fd0d73f169c968a2a2dd02d8099842775633':
|
2013-03-27 22:01:05 -07:00 |
|
Baligh Uddin
|
7ea45c0755
|
am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '7f859d683e5390f9738d375cc6b5fed93ea2c1f9':
|
2013-03-27 22:01:03 -07:00 |
|
Baligh Uddin
|
599290d53f
|
am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'b4039d96001173bcf9dcd3a3bb3d7a1bcd112385':
Import translations. DO NOT MERGE
|
2013-03-27 22:01:02 -07:00 |
|
The Android Automerger
|
a02de1f71d
|
am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '5c3d51e28cad4075faf639a16a7e8a3c8d50c6f0':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-03-27 21:59:47 -07:00 |
|
Tadashi G. Takaoka
|
8b120b985e
|
am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '50cc14b5495f8a712296a21517efe9e405a2322c':
Add const_cast to live with host's jni.h
|
2013-03-27 21:59:47 -07:00 |
|
Tadashi G. Takaoka
|
33fa6a0b3b
|
am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'cc75c950410f206c5bc6406071d256071aeabca9':
Use XmlPullParser.getEventType()
|
2013-03-27 21:59:46 -07:00 |
|
Satoshi Kataoka
|
dd8ca1f821
|
am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'bc586fb1ff553bc640676b348b3b24ee2626bf42':
Fix possible NPE
|
2013-03-27 21:59:44 -07:00 |
|
Tadashi G. Takaoka
|
56b1bd866a
|
am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit 'f892f7751e1263b71dd1b0a49618f922a16df1ae':
Clean up XmlParserUtils
|
2013-03-27 21:59:43 -07:00 |