aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 01a9801f: am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
|\ | | | | | | | | * commit '01a9801fcf8f5ab491405b1240319f0120063087': Add DEBUG_GEO_FULL flag
| * am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
| |\ | | | | | | | | | | | | * commit 'c80b3a29a872e41c2cdc0532e0496db8c8eff64d': Add DEBUG_GEO_FULL flag
| | * Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
| | |\
| | | * Add DEBUG_GEO_FULL flagSatoshi Kataoka2012-09-101-0/+4
| | | | | | | | | | | | | | | | Change-Id: Ibf8eb5fc2056fd138e9e6af1c13fbc065b44a6f1
* | | | am 299c3292: am 32e85fda: Merge "Have makedict support the new file format." ↵Jean Chalard2012-09-101-27/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '299c32929e5712c1beaca83294866518715ecf1d': Have makedict support the new file format.
| * | | am 32e85fda: Merge "Have makedict support the new file format." into jb-mr1-devJean Chalard2012-09-101-27/+21
| |\| | | | | | | | | | | | | | | | | | * commit '32e85fdacfb4c865c7e1565d80697e97e21f3484': Have makedict support the new file format.
| | * | Merge "Have makedict support the new file format." into jb-mr1-devJean Chalard2012-09-101-27/+21
| | |\ \ | | | |/ | | |/|
| | | * Have makedict support the new file format.Yuichiro Hanada2012-09-101-27/+21
| | | | | | | | | | | | | | | | Change-Id: Idcbba71b397f87a5d59e16bb4061d62261c73282
* | | | am 0d2c0878: am 8223086e: Merge "Variable type cleanups" into jb-mr1-devKen Wakasa2012-09-102-9/+8
|\| | | | | | | | | | | | | | | | | | | * commit '0d2c0878d4a7e15c69d7e2fe60c806d8dcb7126b': Variable type cleanups
| * | | am 8223086e: Merge "Variable type cleanups" into jb-mr1-devKen Wakasa2012-09-102-9/+8
| |\| | | | | | | | | | | | | | | | | | * commit '8223086e238e403f6ad342843583d1c89ad55c04': Variable type cleanups
| | * | Merge "Variable type cleanups" into jb-mr1-devKen Wakasa2012-09-102-9/+8
| | |\ \ | | | |/ | | |/|
| | | * Variable type cleanupsKen Wakasa2012-09-102-9/+8
| | | | | | | | | | | | | | | | Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
* | | | am a92a0c5c: am 9a7e02d6: Merge "Add new binary dictionary format." into ↵Ken Wakasa2012-09-103-63/+210
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'a92a0c5c83209bf34dd0559b5a927c7fe5434721': Add new binary dictionary format.
| * | | am 9a7e02d6: Merge "Add new binary dictionary format." into jb-mr1-devKen Wakasa2012-09-103-63/+210
| |\| | | | | | | | | | | | | | | | | | * commit '9a7e02d6fede5cf7f24f0ceb76ff5ad161fdbf60': Add new binary dictionary format.
| | * | Merge "Add new binary dictionary format." into jb-mr1-devKen Wakasa2012-09-103-63/+210
| | |\ \ | | | |/ | | |/|
| | | * Add new binary dictionary format.Yuichiro Hanada2012-09-103-63/+210
| | | | | | | | | | | | | | | | Change-Id: Ia99411d4009857d5e420ca87ef8acf1f1826d3ed
* | | | am 3ea851b8: am 14faf7a4: Merge "Fix backtrace tool" into jb-mr1-devSatoshi Kataoka2012-09-101-4/+7
|\| | | | | | | | | | | | | | | | | | | * commit '3ea851b84db32ae1fc52caa664493ef55d3e98e5': Fix backtrace tool
| * | | am 14faf7a4: Merge "Fix backtrace tool" into jb-mr1-devSatoshi Kataoka2012-09-091-4/+7
| |\| | | | | | | | | | | | | | | | | | * commit '14faf7a47e7415744d628726c596b63d4228aff0': Fix backtrace tool
| | * | Merge "Fix backtrace tool" into jb-mr1-devSatoshi Kataoka2012-09-091-4/+7
| | |\ \ | | | |/ | | |/|
| | | * Fix backtrace toolSatoshi Kataoka2012-09-101-4/+7
| | | | | | | | | | | | | | | | Change-Id: Icc0e8ad94331e62a569183fa05ada335dcc5e26a
* | | | am a4717f27: am 60af4f03: Fix dicttool_aosp buildKen Wakasa2012-09-102-5/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'a4717f27cdc2945c2a34b067454145e0104262a1': Fix dicttool_aosp build
| * | | am 60af4f03: Fix dicttool_aosp buildKen Wakasa2012-09-092-5/+6
| |\| | | | | | | | | | | | | | | | | | * commit '60af4f03a82e8af71e1eb56cd4caed567c003fd4': Fix dicttool_aosp build
| | * | Fix dicttool_aosp buildKen Wakasa2012-09-102-5/+6
| | |/ | | | | | | | | | Change-Id: Iabcf420b4120e3d275fdbcb23939a0ab6052ddf0
* | | am 0295a398: am eae7b293: Check the length of the word when add to ↵Yuichiro Hanada2012-09-104-2/+18
|\| | | | | | | | | | | | | | | | | | | | FusionDictionary. * commit '0295a39845da87f6f082d50a5c3b1b403f5e07c2': Check the length of the word when add to FusionDictionary.
| * | am eae7b293: Check the length of the word when add to FusionDictionary.Yuichiro Hanada2012-09-094-2/+18
| |\| | | | | | | | | | | | | * commit 'eae7b293e4a854819aa0de663066cd0b6cdd52e7': Check the length of the word when add to FusionDictionary.
| | * Check the length of the word when add to FusionDictionary.Yuichiro Hanada2012-09-104-2/+18
| | | | | | | | | | | | Change-Id: Id98d18e90a8b83b597507728b467f56888c8fd12
* | | am 33164f32: am 096f35ff: Fix the condition of continuation for gesture ↵Keisuke Kuroyanagi2012-09-102-22/+70
|\| | | | | | | | | | | | | | | | | | | | input and make ProximityInfoState incremental. * commit '33164f3287e46c7199493a31a36e32a939a75b2a': Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
| * | am 096f35ff: Fix the condition of continuation for gesture input and make ↵Keisuke Kuroyanagi2012-09-092-22/+70
| |\| | | | | | | | | | | | | | | | | | | ProximityInfoState incremental. * commit '096f35ff4b5413906e2a339663baf16e5dabaf64': Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
| | * Fix the condition of continuation for gesture input and make ↵Keisuke Kuroyanagi2012-09-072-22/+70
| | | | | | | | | | | | | | | | | | ProximityInfoState incremental. Change-Id: I69ad295b660e0c4ba5bb29c8d3d8805291ec43a8
* | | am 3992de13: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-100-0/+0
|\| | | | | | | | | | | * commit '3992de13e2520cd144ed939205325251b4db6398':
| * | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Ia7aa78867ab0f737f847d34983cc41e58d5617cc
| | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | |\ \
| | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | |\ \
| | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | |\ \
* | | | | | | | | | | | am 2554fe1e: am b922da84: Merge "Fix bimanual gesture preview trail" into ↵Tadashi G. Takaoka2012-09-073-22/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '2554fe1ed1a3e78f199964cdd607d82e004b2ed4': Fix bimanual gesture preview trail
| * | | | | | | | | | | am b922da84: Merge "Fix bimanual gesture preview trail" into jb-mr1-devTadashi G. Takaoka2012-09-073-22/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b922da847c3ce82b82e445baad5a6c01159608ad': Fix bimanual gesture preview trail
| | * | | | | | | | | | Merge "Fix bimanual gesture preview trail" into jb-mr1-devTadashi G. Takaoka2012-09-073-22/+20
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix bimanual gesture preview trailTadashi G. Takaoka2012-09-073-22/+20
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7122288 Change-Id: I9f0aabe08628880a8439bfda98844ae60206b8de
* | | | | | | | | | | | am f2f61162: am b85df9d5: Merge "Fix bug of sampling and become to save ↵Ken Wakasa2012-09-071-15/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corner points for geometric input." into jb-mr1-dev * commit 'f2f61162e5ef61791fe54b59278f5283a0c7770b': Fix bug of sampling and become to save corner points for geometric input.
| * | | | | | | | | | | am b85df9d5: Merge "Fix bug of sampling and become to save corner points for ↵Ken Wakasa2012-09-071-15/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geometric input." into jb-mr1-dev * commit 'b85df9d5effa7c2854ba51c7a5bbd7460d16069b': Fix bug of sampling and become to save corner points for geometric input.
| | * | | | | | | | | | Merge "Fix bug of sampling and become to save corner points for geometric ↵Ken Wakasa2012-09-071-15/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input." into jb-mr1-dev
| | | * | | | | | | | | | Fix bug of sampling and become to save corner points for geometric input.Keisuke Kuroyanagi2012-09-071-15/+24
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6278a1f7fdcc897c1d6c8d4c8e53730087cc2e5e
* | | | | | | | | | | | am 217d2410: am 7914e907: Add comments for meaningless linesKen Wakasa2012-09-062-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '217d24101dd74dbd66f0ef81cbf04da3f6d0305d': Add comments for meaningless lines
| * | | | | | | | | | | am 7914e907: Add comments for meaningless linesKen Wakasa2012-09-062-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7914e907b5d31ec4b2034a94e393129833770531': Add comments for meaningless lines
| | * | | | | | | | | | Add comments for meaningless linesKen Wakasa2012-09-072-2/+2
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20ebe246f6980fd3054c2c7e98b5150eaabbcc77