aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am ↵Jean Chalard2013-04-170-0/+0
|\ | | | | | | | | | | 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'feb16b6d4f37156d7a42589c210a2c6759349935':
| * am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am ↵Jean Chalard2013-04-100-0/+0
| |\ | | | | | | | | | | | | | | | bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'b8a3454d1a9bd8297c2d4204b9a730702f5e5f9a':
| | * am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am ↵Jean Chalard2013-04-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'a7da57decc9db90a812b6f72ebb4c7050d6f8e66':
* | | | am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '300d3bdee5ab6c3804e0c47ba0665a2d2140c56f':
| * | | am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit 'ab99e6139b699ec05842ca4f0ec53471a39e4186':
| | * | am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 9413e957: Merge "Interpolate gesture preview trails" * commit '8a984e8c4dc6006f1d802cd395143054e3b384b1':
* | | | | am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit '656900003c92a370e3ac2e32b84631c1906d7d31':
| * | | | am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit '7d0d728ceb157afc8ff7ed2dbbcd65f6f5d58491':
| | * | | am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54c091d2: Merge "Move policy and session to AOSP" * commit 'bc36fbfc6ced487824ef364ec2af457a0c8ce543':
* | | | | | am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit 'c14fdded82fb293bd6d5a7b5487e4c6b0c8625dd':
| * | | | | am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit '714b0044f12e976a10a7d7fe1dcd7498177fc131':
| | * | | | am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit '2cd99981bd2d20f252cf2bdf70d7b71bedc3669a':
* | | | | | | am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit 'c26022cf59801de74e19fda38a7aff76f3039ad4':
| * | | | | | am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit 'd901066bf6e0c977fbe9a20dd10bb1954744d4c6':
| | * | | | | am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit 'f921a587842a5b1df59030e38e115e1b830b3164':
* | | | | | | | am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'd196cb6400c074c7c03416b62c2428986c3a74e2':
| * | | | | | | am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit '8c485086f54bd70b799aea158e9db1871762d198':
| | * | | | | | am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38c26dd0: Move dicnode to AOSP * commit '5180572736145cc521fe375a5451bc2bd172dc1a':
* | | | | | | | | am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: ↵The Android Open Source Project2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a0b2dc74fa521cf584536b72e390f2aadb48d42b':
| * | | | | | | | am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am ↵The Android Open Source Project2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'aeb9680522c351e1f5ec1b7004953168a14805e0':
| | * | | | | | | am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: ↵The Android Open Source Project2013-04-100-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'cfe49191f7ee1d2b3fe17dd37898c625d563982c':
* | | | | | | | | | am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit 'b949db38568d02be216a9986ed0992ae57f0c13b':
| * | | | | | | | | am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70747ad6: am 97a3ce02: Merge "Refactor" * commit '51c0380fb639888cdc3562a939083c34ee8eeaef':
| | * | | | | | | | am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97a3ce02: Merge "Refactor" * commit 'd7c3c523d920dc97a2c4fc3c9430a373f494fe21':
* | | | | | | | | | | am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit '9a181179b2c8ec8ee4b0468158cb565af8ceda8e':
| * | | | | | | | | | am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a38d907b: am 740da0d8: Fix an NPE * commit '62e0ee324bb17540d37dd4f2e8f01b601e4e4da6':
| | * | | | | | | | | am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 740da0d8: Fix an NPE * commit 'c7163a4c8c373520fb8fa82011a366a1d98decea':
* | | | | | | | | | | | am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler * commit '023ed8a661c792d6ab0e405469296971c27ddc4c':
| * | | | | | | | | | | am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler * commit '05ed9c763189536185e899ababd391c0bd56a9dd':
| | * | | | | | | | | | am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler * commit '617362fdb9d8480a4be301b2e6e1f6b355e0e1a3':
* | | | | | | | | | | | | am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" * commit '3f17ab4139e586536ea90a5d7d183ae78f273e00':
| * | | | | | | | | | | | am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" * commit '724e100eea715306e215d625cd73713d2d41e9c0':
| | * | | | | | | | | | | am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2188cbae: Merge "Fix an NPE" * commit '84b246f147295ed4a2c1c95802b130842596e5a2':
* | | | | | | | | | | | | | am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup" * commit '0eb58dfe0c30b9cbc34771bae2cda48fa94d2f79':
| * | | | | | | | | | | | | am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a657afc3: am d555a0d7: Merge "Cleanup" * commit '1037300602d8b310d1a91cc4e601b360db0620ea':
| | * | | | | | | | | | | | am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d555a0d7: Merge "Cleanup" * commit '5c874a7b58a8f7912315a935e8c5fe4d3fe0d973':
* | | | | | | | | | | | | | | am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki * commit 'faa708c326b360eb6097587291727aff1a87fe56':
| * | | | | | | | | | | | | | am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki * commit '36583063a44c627b70a2494ee2a12879a0685cdb':
| | * | | | | | | | | | | | | am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki * commit '8ed884e70f1bb5ba9cbfdae009be1cc72dccda39':
* | | | | | | | | | | | | | | | am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE * commit 'dbf9168f8616df012dc1faeaf3bffe34d7057d6a':
| * | | | | | | | | | | | | | | am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE * commit 'b3fbdd58be95d65da36a270d4021fa65752f0ffa':
| | * | | | | | | | | | | | | | am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE * commit 'f939332ca9eb9ed3139b316598b213f5a55f7864':
* | | | | | | | | | | | | | | | | am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ↵The Android Automerger2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit '2cb2c001661383aa79f21992c4d783f2cb856c80':
| * | | | | | | | | | | | | | | | am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am ↵The Android Automerger2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit '6e6f705ecd972c34659577f0f1c4259bd727d2ab':
| | * | | | | | | | | | | | | | | am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am ↵The Android Automerger2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit 'c82a56b427baa7edf0ce687af0f7591cbef77185':
* | | | | | | | | | | | | | | | | | am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h * commit '19b5a10407838dd5f05bdca1663d6615313e131b':
| * | | | | | | | | | | | | | | | | am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h * commit 'ae3ead496271316515ad8d5409a4bc6041e5a303':
| | * | | | | | | | | | | | | | | | am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h * commit 'faadc0a7cf059ec88f2c54b00a0812e978e6771b':
* | | | | | | | | | | | | | | | | | | am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()" * commit '6e5363219506060390aabc79e60f7a280f5693a6':
| * | | | | | | | | | | | | | | | | | am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()" * commit '31f350bcb3a399c865eeee057aeefd3678253832':