Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-16 | 11 | -171/+175 | |
|\ | |||||
| * | Merge "Cleanup speed related code" | 2012-11-16 | 2 | -141/+149 | |
| |\ | |||||
| | * | Cleanup speed related code•••Change-Id: Id6ea99a9e28f20f3ac34b9bfdac1bf62fd7a9a5d | 2012-11-16 | 2 | -141/+149 | |
| * | | Remove unused variables•••Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca | 2012-11-16 | 9 | -27/+23 | |
| |/ | |||||
| * | Fix debug logs•••Change-Id: Ie7dc32f28915df62a7c31bdaed38c0ad7a4b0f1c | 2012-11-15 | 1 | -4/+4 | |
* | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-15 | 2 | -10/+10 | |
|\| | |||||
| * | Fix debug build error•••Change-Id: Id18d72093a36d41859744f98238b3b761ddb667e | 2012-11-15 | 2 | -10/+10 | |
* | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-15 | 1 | -10/+5 | |
|\| | |||||
| * | am eea28db3: am d4886ff5: am 929bfdd0: Merge "Update shift state only when in...•••* commit 'eea28db3333a734bf73e688b8335245929d5f322': Update shift state only when input field is restarted | 2012-11-14 | 1 | -10/+5 | |
| |\ | |||||
| | * | am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is ...•••* commit 'd4886ff5419003c3bf996939ba87e4b49bcdbfae': Update shift state only when input field is restarted | 2012-11-14 | 1 | -10/+5 | |
| | |\ | |||||
| | | * | am 929bfdd0: Merge "Update shift state only when input field is restarted" in...•••* commit '929bfdd059df5bb0340a3b22a3feff211f03798e': Update shift state only when input field is restarted | 2012-11-14 | 1 | -10/+5 | |
| | | |\ | |||||
| | | | * | Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev | 2012-11-14 | 1 | -10/+5 | |
| | | | |\ | |||||
| | | | | * | Update shift state only when input field is restarted•••Bug: 7482766 Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285 | 2012-11-14 | 1 | -10/+5 | |
| * | | | | | am dda024cf: (-s ours) am 428d1b64: am 4826c3ff: Merge "Fix language switch k...•••* commit 'dda024cf300cfc69125a8812d565df4f512e64f5': Fix language switch key behavior (DO NOT MERGE) | 2012-11-14 | 0 | -0/+0 | |
| |\| | | | | |||||
| | * | | | | am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MER...•••* commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7': Fix language switch key behavior (DO NOT MERGE) | 2012-11-14 | 2 | -16/+39 | |
| | |\| | | | |||||
| | | * | | | am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-...•••* commit '4826c3ff7ec8640d2a982e9362577b2900614080': Fix language switch key behavior (DO NOT MERGE) | 2012-11-14 | 2 | -16/+39 | |
| | | |\| | | |||||
| | | | * | | Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev | 2012-11-14 | 2 | -16/+39 | |
| | | | |\ \ | |||||
| | | | | * | | Fix language switch key behavior (DO NOT MERGE)•••Bug: 7075923 Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496 | 2012-11-14 | 2 | -16/+39 | |
| | | | | |/ | |||||
| * | | | | | am f83e6404: (-s ours) am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error ...•••* commit 'f83e640419b7917af938deba654238c21653ee1d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE | 2012-11-14 | 0 | -0/+0 | |
| |\| | | | | |||||
| | * | | | | am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error in the base char table ...•••* commit '36c6e2933f1e25013b5d04d651cab8938e7f1090': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE | 2012-11-14 | 1 | -1/+1 | |
| | |\| | | | |||||
| | | * | | | am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L ...•••* commit 'aef0acdbe078fe83ed834ffe986e9cb7b4b8df7d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE | 2012-11-14 | 1 | -1/+1 | |
| | | |\| | | |||||
| | | | * | | DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE•••Cherrypick of I67a431d8 bug: 7539944 Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf | 2012-11-15 | 1 | -1/+1 | |
| | | | |/ | |||||
* | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-14 | 12 | -19/+488 | |
|\| | | | | |||||
| * | | | | Merge "Fix an error in the base char table for LETTER L WITH STROKE" | 2012-11-14 | 1 | -1/+1 | |
| |\ \ \ \ | |||||
| | * | | | | Fix an error in the base char table for LETTER L WITH STROKE•••bug: 7539944 Change-Id: I67a431d8d60f3236fb7d616504c5d0cf2166f486 | 2012-11-14 | 1 | -1/+1 | |
| * | | | | | Merge "Add Mongolian keyboard" | 2012-11-14 | 9 | -0/+452 | |
| |\ \ \ \ \ | |||||
| | * | | | | | Add Mongolian keyboard•••Bug: 7455289 Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f | 2012-11-13 | 9 | -0/+452 | |
| * | | | | | | Merge "Fix language switch key behavior" | 2012-11-14 | 2 | -18/+35 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Fix language switch key behavior•••Bug: 7075923 Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623 | 2012-11-14 | 2 | -18/+35 | |
* | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-14 | 3 | -2/+8 | |
|\| | | | | | | |||||
| * | | | | | | Merge "Correct a wrong base character in Russian" | 2012-11-14 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Correct a wrong base character in Russian•••This is the master counterpart of I80cee4b2 Bug: 7516306 Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9 | 2012-11-14 | 1 | -2/+2 | |
| * | | | | | | | Merge "Swap single and double quotation marks in Spanish tablet keyboard" | 2012-11-13 | 2 | -0/+6 | |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Swap single and double quotation marks in Spanish tablet keyboard•••Bug: 6672279 Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155 | 2012-11-14 | 2 | -0/+6 | |
| | |/ / / / / / | |||||
* | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-14 | 1 | -0/+8 | |
|\| | | | | | | | |||||
| * | | | | | | | Hide statustics logging option•••Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0 | 2012-11-14 | 1 | -0/+8 | |
| |/ / / / / / | |||||
* | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-14 | 1 | -11/+19 | |
|\| | | | | | | |||||
| * | | | | | | am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly...•••* commit '18ff56125345746e288118d177fcabf3c079ead3': Make sure all FDs are correctly closed. | 2012-11-13 | 1 | -11/+19 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." int...•••* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503': Make sure all FDs are correctly closed. | 2012-11-13 | 1 | -11/+19 | |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev•••* commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4': Make sure all FDs are correctly closed. | 2012-11-13 | 1 | -11/+19 | |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev | 2012-11-13 | 1 | -11/+19 | |
| | | | |\ \ \ | |||||
| | | | | * | | | Make sure all FDs are correctly closed.•••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 | 2012-11-13 | 1 | -11/+19 | |
* | | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage | 2012-11-13 | 2 | -74/+75 | |
|\| | | | | | | | |||||
| * | | | | | | | am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing...•••* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc': Don't restrict reset composing state to non-identical setText | 2012-11-12 | 1 | -14/+10 | |
| |\| | | | | | | |||||
| | * | | | | | | am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non...•••* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919': Don't restrict reset composing state to non-identical setText | 2012-11-12 | 1 | -14/+10 | |
| | |\| | | | | | |||||
| | | * | | | | | am fac619a3: Merge "Don\'t restrict reset composing state to non-identical se...•••* commit 'fac619a34c8101cac504db500d74114dc8768372': Don't restrict reset composing state to non-identical setText | 2012-11-12 | 1 | -14/+10 | |
| | | |\| | | | | |||||
| | | | * | | | | Merge "Don't restrict reset composing state to non-identical setText" into jb... | 2012-11-12 | 1 | -14/+10 | |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Don't restrict reset composing state to non-identical setText•••Bug: 7497063 Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478 | 2012-11-12 | 1 | -14/+10 | |
| | | | | |/ / / | |||||
| * | | | | | / | Resolve conflicts for merge of 3a9ba17f to master"•••Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49 | 2012-11-13 | 1 | -5/+10 | |
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one p...•••* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e': Refactor all phantom-space-inserted spaces in one place | 2012-11-12 | 1 | -5/+10 | |
| | |\| | | | |