aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | am b1844a57: am b240c38e: Merge "[DO NOT MERGE] Correct a wrong base ↵Jean Chalard2012-11-141-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | character in Russian" into jb-mr1.1-dev * commit 'b1844a57e1d05ac398beed2695b883d2f736cd13': [DO NOT MERGE] Correct a wrong base character in Russian
| | | * | | | | am b240c38e: Merge "[DO NOT MERGE] Correct a wrong base character in ↵Jean Chalard2012-11-141-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Russian" into jb-mr1.1-dev * commit 'b240c38ea2e10460aeb351fa9aef56f3d872bca3': [DO NOT MERGE] Correct a wrong base character in Russian
| | | | * | | | Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into ↵Jean Chalard2012-11-141-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | | | * | | | [DO NOT MERGE] Correct a wrong base character in RussianJean Chalard2012-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7516306 Change-Id: I80cee4b2b11e5bfa68c12923049cb612abd0bc7e
* | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-1611-171/+175
|\| | | | | | | |
| * | | | | | | | Merge "Cleanup speed related code"Satoshi Kataoka2012-11-162-141/+149
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cleanup speed related codeSatoshi Kataoka2012-11-162-141/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6ea99a9e28f20f3ac34b9bfdac1bf62fd7a9a5d
| * | | | | | | | | Remove unused variablesKen Wakasa2012-11-169-27/+23
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
| * | | | | | | | Fix debug logsSatoshi Kataoka2012-11-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7dc32f28915df62a7c31bdaed38c0ad7a4b0f1c
* | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-152-10/+10
|\| | | | | | | |
| * | | | | | | | Fix debug build errorKen Wakasa2012-11-152-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id18d72093a36d41859744f98238b3b761ddb667e
* | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-151-10/+5
|\| | | | | | | |
| * | | | | | | | am eea28db3: am d4886ff5: am 929bfdd0: Merge "Update shift state only when ↵Tadashi G. Takaoka2012-11-141-10/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input field is restarted" into jb-mr1.1-dev * commit 'eea28db3333a734bf73e688b8335245929d5f322': Update shift state only when input field is restarted
| | * | | | | | | am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is ↵Tadashi G. Takaoka2012-11-141-10/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restarted" into jb-mr1.1-dev * commit 'd4886ff5419003c3bf996939ba87e4b49bcdbfae': Update shift state only when input field is restarted
| | | * | | | | | am 929bfdd0: Merge "Update shift state only when input field is restarted" ↵Tadashi G. Takaoka2012-11-141-10/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit '929bfdd059df5bb0340a3b22a3feff211f03798e': Update shift state only when input field is restarted
| | | | * | | | | Merge "Update shift state only when input field is restarted" into jb-mr1.1-devTadashi G. Takaoka2012-11-141-10/+5
| | | | |\ \ \ \ \
| | | | | * | | | | Update shift state only when input field is restartedTadashi G. Takaoka2012-11-141-10/+5
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7482766 Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
| * | | | | | | | am dda024cf: (-s ours) am 428d1b64: am 4826c3ff: Merge "Fix language switch ↵Tadashi G. Takaoka2012-11-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key behavior (DO NOT MERGE)" into jb-mr1.1-dev * commit 'dda024cf300cfc69125a8812d565df4f512e64f5': Fix language switch key behavior (DO NOT MERGE)
| | * | | | | | | am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT ↵Tadashi G. Takaoka2012-11-142-16/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into jb-mr1.1-dev * commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7': Fix language switch key behavior (DO NOT MERGE)
| | | * | | | | | am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into ↵Tadashi G. Takaoka2012-11-142-16/+39
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '4826c3ff7ec8640d2a982e9362577b2900614080': Fix language switch key behavior (DO NOT MERGE)
| | | | * | | | | Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-devTadashi G. Takaoka2012-11-142-16/+39
| | | | |\ \ \ \ \
| | | | | * | | | | Fix language switch key behavior (DO NOT MERGE)Tadashi G. Takaoka2012-11-142-16/+39
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7075923 Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
| * | | | | | | | am f83e6404: (-s ours) am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error ↵Ken Wakasa2012-11-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the base char table for LETTER L WITH STROKE * commit 'f83e640419b7917af938deba654238c21653ee1d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| | * | | | | | | am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error in the base char table ↵Ken Wakasa2012-11-141-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for LETTER L WITH STROKE * commit '36c6e2933f1e25013b5d04d651cab8938e7f1090': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| | | * | | | | | am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L ↵Ken Wakasa2012-11-141-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH STROKE * commit 'aef0acdbe078fe83ed834ffe986e9cb7b4b8df7d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| | | | * | | | | DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKEKen Wakasa2012-11-151-1/+1
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of I67a431d8 bug: 7539944 Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf
* | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-1412-19/+488
|\| | | | | | |
| * | | | | | | Merge "Fix an error in the base char table for LETTER L WITH STROKE"Ken Wakasa2012-11-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix an error in the base char table for LETTER L WITH STROKEKen Wakasa2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7539944 Change-Id: I67a431d8d60f3236fb7d616504c5d0cf2166f486
| * | | | | | | | Merge "Add Mongolian keyboard"Tadashi G. Takaoka2012-11-149-0/+452
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add Mongolian keyboardTadashi G. Takaoka2012-11-139-0/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7455289 Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f
| * | | | | | | | | Merge "Fix language switch key behavior"Tadashi G. Takaoka2012-11-142-18/+35
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix language switch key behaviorTadashi G. Takaoka2012-11-142-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7075923 Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
* | | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-143-2/+8
|\| | | | | | | | |
| * | | | | | | | | Merge "Correct a wrong base character in Russian"Jean Chalard2012-11-141-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Correct a wrong base character in RussianJean Chalard2012-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the master counterpart of I80cee4b2 Bug: 7516306 Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9
| * | | | | | | | | | Merge "Swap single and double quotation marks in Spanish tablet keyboard"Tadashi G. Takaoka2012-11-132-0/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Swap single and double quotation marks in Spanish tablet keyboardTadashi G. Takaoka2012-11-142-0/+6
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6672279 Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
* | | | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-141-0/+8
|\| | | | | | | | | |
| * | | | | | | | | | Hide statustics logging optionSatoshi Kataoka2012-11-141-0/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
* | | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-141-11/+19
|\| | | | | | | | |
| * | | | | | | | | am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are ↵Jean Chalard2012-11-131-11/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly closed." into jb-mr1.1-dev * commit '18ff56125345746e288118d177fcabf3c079ead3': Make sure all FDs are correctly closed.
| | * | | | | | | | am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." ↵Jean Chalard2012-11-131-11/+19
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503': Make sure all FDs are correctly closed.
| | | * | | | | | | am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-devJean Chalard2012-11-131-11/+19
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4': Make sure all FDs are correctly closed.
| | | | * | | | | | Merge "Make sure all FDs are correctly closed." into jb-mr1.1-devJean Chalard2012-11-131-11/+19
| | | | |\ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | | * | | | | Make sure all FDs are correctly closed.Jean Chalard2012-11-131-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this kind of series of calls, it's possible that an outer call to a constructor fails, but the inner succeeded. Example: try { is = new A(new B()); } finally { if (null != is) is.close(); } In this case, if new B() succeeds but new A() throws an exception, is stays null and the intermediate object is never closed. This is what was happening in this instance. Bug: 7377336 Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
* | | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-132-74/+75
|\| | | | | | | | |
| * | | | | | | | | am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset ↵Jean Chalard2012-11-121-14/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | composing state to non-identical setText" into jb-mr1.1-dev * commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc': Don't restrict reset composing state to non-identical setText
| | * | | | | | | | am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to ↵Jean Chalard2012-11-121-14/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-identical setText" into jb-mr1.1-dev * commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919': Don't restrict reset composing state to non-identical setText
| | | * | | | | | | am fac619a3: Merge "Don\'t restrict reset composing state to non-identical ↵Jean Chalard2012-11-121-14/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setText" into jb-mr1.1-dev * commit 'fac619a34c8101cac504db500d74114dc8768372': Don't restrict reset composing state to non-identical setText