aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | Fix possible NPESatoshi Kataoka2013-03-251-19/+21
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8457109 Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
* | | | | | | | | | | | | | | | | | | | | | Clean up XmlParserUtilsTadashi G. Takaoka2013-03-263-27/+30
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I636e8f359d47f39e61a7f77e3e686f2721779b6f
* | | | | | | | | | | | | | | | | | | | | am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGEBaligh Uddin2013-03-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | * commit 'ff41125b74053ff3ad006f5dfd824e2351a47ee4': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | am fba54597: Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fba545975020525c0017bde8424db28dd21d5186': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8468f1e69374a5ada2ea03e427895b771b8dc048 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | Fix possible ArrayIndexOutOfBoundsExceptionTadashi G. Takaoka2013-03-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8461864 Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
* | | | | | | | | | | | | | | | | am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGEBaligh Uddin2013-03-230-0/+0
|\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7668deece811d5f11ee652d6b5e5d7611273b270': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | am 21160c4e: Import translations. DO NOT MERGEBaligh Uddin2013-03-2349-1631/+1551
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21160c4eba74344a583cae423b1909483559c87f': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2249-1631/+1551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-2349-1730/+1942
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2249-1730/+1942
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1 Auto-generated-cl: translation import
* / | | | | | | | | | | | | | Don't announce changes for A11y within the same keyboard mode.Alan Viverette2013-03-221-20/+17
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8439108 Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
* | | | | | | | | | | | | | Merge "Fix appname"Satoshi Kataoka2013-03-2257-1343/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix appnameSatoshi Kataoka2013-03-2257-1343/+49
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
* / | | | | | | | | | | | Remove unused importTadashi G. Takaoka2013-03-222-2/+0
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of I062c076f. Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
* | | | | | | | | | | | Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-223-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove reference to string.english_ime_nameTadashi G. Takaoka2013-03-223-11/+15
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d
* | | | | | | | | | | Merge "Use correct appname resource"Satoshi Kataoka2013-03-221-7/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Use correct appname resourceSatoshi Kataoka2013-03-221-7/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8
* | | | | | | | | | am 74089a09: am ba0e497a: Merge commit ↵Baligh Uddin2013-03-221-3/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits) am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE ...
| * | | | | | | | am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into ↵Baligh Uddin2013-03-2219-394/+607
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'ba0e497a0c53ae2a64c070544f6a6f0495442343': (126 commits) am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. Support feedback Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE [FileEncap9] Extract ResearchLogDirectory class [Lazy2] Pass a runnable to abort [Lazy1] Switch to blocking log closures Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE [Lazy4] Remove useless debug code [FileEncap8] Remove useless "success" variable [FileEncap7] Extract uploadContents method [FileEncap6] Extract Uploader class Import translations. DO NOT MERGE Import translations. DO NOT MERGE [FileEncap5] Move conditional logic to caller [FileEncap4] Simplify logic [FileEncap3] Extract isUploadingUnconditionally method ...
| | * | | | | | | Merge commit '525bbec9eccbf5bd4581c2b9908e46f61c4431ad' into jb-mr2-devBaligh Uddin2013-03-2119-394/+607
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a ↵Alan Viverette2013-03-201-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null keyboard view. * commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c': Prevent keyboard A11y proxy from referencing a null keyboard view.
| | | * | | | | | merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogleThe Android Automerger2013-03-190-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26d82ea1465ff4a7617b0cd5a94bb6a8c1b8df76 Auto-generated-cl: translation import
| | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec0b99658d2bdbf7d6cd640733dcb9de3bc33ef0 Auto-generated-cl: translation import
| | | | * | | | | keep history after resetThe Android Automerger2013-03-120-0/+0
| | | | |\ \ \ \ \
| | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I545d16f26fc007432057bc1520e0d85226f026d3 Auto-generated-cl: translation import
| | | * | | | | | | am a462cd80: Support feedbackSatoshi Kataoka2013-03-195-0/+56
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645': Support feedback
| | | * \ \ \ \ \ \ \ am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to buildJean Chalard2013-03-198-34/+61
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7': Break dependencies to allow offdevice tests to build
| | | * \ \ \ \ \ \ \ \ am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.Jean Chalard2013-03-1993-34/+7481
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d90a10a343723b8613fd22d323c586ecc33b284': Merge the dictionary pack in Latin IME.
| | | * \ \ \ \ \ \ \ \ \ am 841c295f: resolved conflicts for merge of 5b048292 to masterTadashi G. Takaoka2013-03-1820-93/+111
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '841c295f3c99214f45924434d9c0bb5b4760578d': Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
| | | * \ \ \ \ \ \ \ \ \ \ am bbadc6ed: (-s ours) am 20591e43: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0': Import translations. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ \ \ am c542a588: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c542a5882efde7b15a7278041c15a93c4d577ca9': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873 Auto-generated-cl: translation import
| | | * | | | | | | | | | | | | am f8325ec4: am 5cb0560b: Merge "Access the dictionary pack only if have ↵Jean Chalard2013-03-181-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERNET permission" into jb-mr2-dev * commit 'f8325ec4bb83f91d53949562556652bff315f088': Access the dictionary pack only if have INTERNET permission
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 62ed594c: am e0e67373: Refactor parameters by naming conventionSatoshi Kataoka2013-03-1712-120/+127
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62ed594c373e172ba7b32d099911b318dcbfc7b2': Refactor parameters by naming convention
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3268a44e: am a5067333: Disable the header list of DebugSettingsActivityTadashi G. Takaoka2013-03-152-7/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3268a44e1cde2f4e14d01ac62e2e1a6e9a70a601': Disable the header list of DebugSettingsActivity
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f33f1cab: [FileEncap9] Extract ResearchLogDirectory classKurt Partridge2013-03-145-82/+153
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f33f1cab2fd57fe39955593e68902554ed57a053': [FileEncap9] Extract ResearchLogDirectory class
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7faa2caa: Merge "[Lazy4] Remove useless debug code"Kurt Partridge2013-03-141-33/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27': [Lazy4] Remove useless debug code
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 95e09ea7: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95e09ea7b80c30139919d7b8fb6f38c90e6e081c': Import translations. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-03-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into jb-mr2-dev * commit 'e563e585d13c3f23518e73c1af5ca42de6f31778': Import translations. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-1449-3/+553
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6 Auto-generated-cl: translation import
| | | * | | | | | | | | | | | | | | | | | | | am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" ↵Tadashi G. Takaoka2013-03-131-7/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'fb606c6277fdf7385bf8ce876102bda016465e8f': Clean up StaticInnerHandlerWrapper a bit
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1ab33383: am 0d5f214a: Fix NPE found in monkey testTadashi G. Takaoka2013-03-131-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ab33383f983082621084a65a168101e5fb526e0': Fix NPE found in monkey test
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3f46e8a8: am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-devSatoshi Kataoka2013-03-132-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f46e8a887a0ff6c59642d3ff68791a07574ea5c': Refactor skippable code point
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68e9f78b: (-s ours) am 8067b769: (-s ours) Merge "[DO NOT MERGE] ↵Jean Chalard2013-03-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deactivate H/W keyboard handling" into jb-mr2-dev * commit '68e9f78b560b61a50e0e850c03e492730e51ed28': [DO NOT MERGE] Deactivate H/W keyboard handling
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to ↵Tadashi G. Takaoka2013-03-131-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onResume" into jb-mr2-dev * commit 'f5caf5be994f8b7885f4e434e25019fd847ca927': Move checking non-persistent checkbox to onResume