Commit Graph

8446 Commits (7c3ba4b2dc946a983a6460fd8914f9cc8f4f09a1)

Author SHA1 Message Date
Kurt Partridge bd3278536d am 7bcbdcb0: am f1c3e53b: Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
* commit '7bcbdcb074c47c9632ee2af2d243103f41b5867a':
  Revert "ResearchLogging upload via service"
2012-08-20 10:22:43 -07:00
Kurt Partridge 7fe4eeb800 am 48643b0e: Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
* commit '48643b0e0d73703f4b3357add9f793d521eedf96':
  Revert "ResearchLogger log RichInputConnection"
2012-08-20 10:20:44 -07:00
Kurt Partridge 38b5623fcf am e15e6c2c: Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev
* commit 'e15e6c2c2769abcd35c5c099b2cc5073c98371f0':
  Revert "ResearchLogger to track simple statistics"
2012-08-20 10:20:43 -07:00
Kurt Partridge 8ec526e43d am adb591e7: Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev
* commit 'adb591e75b9a28b0a9af1a35a366ecaa33f56abb':
  Revert "ResearchLogging capture full n-gram data"
2012-08-20 10:20:41 -07:00
Kurt Partridge 4a946c9dd1 am 7b0459e1: Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
* commit '7b0459e1a86a299880681ca6bc6522402930a101':
  Revert "ResearchLogging log when preferences change"
2012-08-20 10:20:40 -07:00
Kurt Partridge 7bcbdcb074 am f1c3e53b: Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
* commit 'f1c3e53b2336b9c5c9e357fad5f3cb1d85f6b1ac':
  Revert "ResearchLogging upload via service"
2012-08-20 10:20:39 -07:00
Kurt Partridge 48643b0e0d Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev 2012-08-20 10:18:40 -07:00
Kurt Partridge e15e6c2c27 Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev 2012-08-20 10:18:30 -07:00
Kurt Partridge adb591e75b Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev 2012-08-20 10:18:30 -07:00
Kurt Partridge 7b0459e1a8 Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev 2012-08-20 10:18:20 -07:00
Kurt Partridge f1c3e53b23 Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev 2012-08-20 10:18:10 -07:00
Kurt Partridge 35c11842a7 Revert "ResearchLogger log RichInputConnection"
This reverts commit 1964ffb3f4

Change-Id: Ie43e7ac828faa91e1824a255bb3ecf6c8222d4e8
2012-08-20 10:17:45 -07:00
Kurt Partridge 77257a736e Revert "ResearchLogger to track simple statistics"
This reverts commit 7cec911fde

Change-Id: I3eb055e03a9cf463356ebaefc7827ab65a963072
2012-08-20 10:17:43 -07:00
Kurt Partridge 3d35908749 Revert "ResearchLogging capture full n-gram data"
This reverts commit 221e756fd7

Change-Id: Iefc4e4e27ddc925d4a4634627b0467bd4ee2a66e
2012-08-20 10:17:40 -07:00
Kurt Partridge fc74a01abe Revert "ResearchLogging log when preferences change"
This reverts commit c58f5d904b

Change-Id: Ifab54ecc8b7898fe0af6446d397efd6cdb28f670
2012-08-20 10:17:31 -07:00
Kurt Partridge 96da633582 Revert "ResearchLogging upload via service"
This reverts commit baf1f0bd61

Change-Id: I7d959b9b626c8fb69a57788e243752952258fa80
2012-08-20 10:17:29 -07:00
Kurt Partridge 568c714e99 am fdf92658: am 8beeef5d: Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* commit 'fdf926580876a313ddfb07b7625914a8d77852e1':
  ResearchLogging upload via service
  ResearchLogging log when preferences change
2012-08-20 09:44:53 -07:00
Kurt Partridge 6eeb2d0c9e am 45e513fa: (-s ours) am 752c5376: Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* commit '45e513fadf614ff1fff17e431aef64d54ba969ff':
  ResearchLogging capture full n-gram data
  ResearchLogger to track simple statistics
2012-08-20 09:44:52 -07:00
Kurt Partridge 98bc26cccd am 46dd5a56: (-s ours) am 461f1942: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
* commit '46dd5a56125ec4218e65bc532e022965bf5b8d90':
  ResearchLogger log RichInputConnection
2012-08-20 09:42:11 -07:00
Kurt Partridge fdf9265808 am 8beeef5d: Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* commit '8beeef5d3f5006a0386e47561a2bdb19e18801a9':
  ResearchLogging upload via service
  ResearchLogging log when preferences change
2012-08-20 08:50:12 -07:00
Kurt Partridge 45e513fadf am 752c5376: Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* commit '752c53760cd963c2bd88f327d032b6b92e1bd793':
  ResearchLogging capture full n-gram data
  ResearchLogger to track simple statistics
2012-08-20 08:48:35 -07:00
Kurt Partridge 46dd5a5612 am 461f1942: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
* commit '461f1942f94b00a9c75d882cdf9d82c1a758b22b':
  ResearchLogger log RichInputConnection
2012-08-20 08:48:33 -07:00
Kurt Partridge 8beeef5d3f Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* changes:
  ResearchLogging upload via service
  ResearchLogging log when preferences change
2012-08-20 08:48:12 -07:00
Kurt Partridge 752c53760c Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* changes:
  ResearchLogging capture full n-gram data
  ResearchLogger to track simple statistics
2012-08-20 08:47:45 -07:00
Kurt Partridge 461f1942f9 Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev 2012-08-20 08:47:33 -07:00
The Android Automerger 2163f09418 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-20 06:35:49 -07:00
Tadashi G. Takaoka fabc127eb2 am 64047d58: am 5a49a8bb: Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev
* commit '64047d58723683760fe1713a27d9274f7f7bdd73':
  Cleaup gesture preview drawing code a bit
2012-08-19 23:45:37 -07:00
Tadashi G. Takaoka 64047d5872 am 5a49a8bb: Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev
* commit '5a49a8bb5f3f70619237604f91f7c1354fcb5fea':
  Cleaup gesture preview drawing code a bit
2012-08-19 23:44:09 -07:00
Tadashi G. Takaoka 5a49a8bb5f Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev 2012-08-19 23:42:05 -07:00
Tadashi G. Takaoka 978c0fc878 Cleaup gesture preview drawing code a bit
Change-Id: Ie75d497ba88805d945d6039ecad09ed0e8e5e4d3
2012-08-20 15:40:03 +09:00
Tadashi G. Takaoka 63b842f572 am 291de5e1: am cb2362ce: Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev
* commit '291de5e1c4b5c4be906fdaa13470e4ae6c307779':
  Make some usages of SparseArray thread-safe
2012-08-19 23:26:46 -07:00
Tadashi G. Takaoka 291de5e1c4 am cb2362ce: Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev
* commit 'cb2362cee1a6700fb15730e12a62ae2004baae4f':
  Make some usages of SparseArray thread-safe
2012-08-19 23:24:34 -07:00
Tadashi G. Takaoka cb2362cee1 Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev 2012-08-19 23:23:08 -07:00
Tadashi G. Takaoka 8ce351a827 Make some usages of SparseArray thread-safe
This is a follow up of I39d9bf1a7c272eb16d6ed4698f52457579b40f10.

Change-Id: Ic3288e491175f9a85679a21064093f9db5a65466
2012-08-20 15:00:26 +09:00
Jean Chalard bda0632bd6 am b2145d06: am 2cd248ee: Merge "Remove the whitelist resources" into jb-mr1-dev
* commit 'b2145d0660c04dd39e0d5eaa095c92187afff75d':
  Remove the whitelist resources
2012-08-19 22:45:53 -07:00
Jean Chalard b2145d0660 am 2cd248ee: Merge "Remove the whitelist resources" into jb-mr1-dev
* commit '2cd248ee05009385f1c67aafede6a776f937ec06':
  Remove the whitelist resources
2012-08-19 22:43:48 -07:00
Jean Chalard 2cd248ee05 Merge "Remove the whitelist resources" into jb-mr1-dev 2012-08-19 22:42:14 -07:00
Jean Chalard 3d05a4573e am 2a62a978: am 1aed102d: Merge "Fix capitalization, part 1" into jb-mr1-dev
* commit '2a62a978f39d9d3c50e45aa24d0639060074c7e8':
  Fix capitalization, part 1
2012-08-19 22:33:09 -07:00
Jean Chalard 2a62a978f3 am 1aed102d: Merge "Fix capitalization, part 1" into jb-mr1-dev
* commit '1aed102d4cfa02befcf3d1377ab94bdb412c8862':
  Fix capitalization, part 1
2012-08-19 22:32:04 -07:00
Jean Chalard 1aed102d4c Merge "Fix capitalization, part 1" into jb-mr1-dev 2012-08-19 22:29:59 -07:00
Jean Chalard 5d9e573fbf Remove the whitelist resources
Bug: 6906525
Change-Id: I1524b9e4c56d28a701d444aa2afbfdcecf0da571
2012-08-20 14:25:14 +09:00
Jean Chalard abf8008b08 am e5ee97f7: am 4c6db059: Merge "Remove the whitelist dictionary." into jb-mr1-dev
* commit 'e5ee97f709c35a9fce0975a45b136518fcad6951':
  Remove the whitelist dictionary.
2012-08-19 22:17:14 -07:00
Jean Chalard 96a1c1a34e am 6ce0c23e: am 04d6649d: Merge "Remove access to the whitelist class." into jb-mr1-dev
* commit '6ce0c23e40da08393407e39af6faacda93793f8d':
  Remove access to the whitelist class.
2012-08-19 22:17:13 -07:00
Jean Chalard e5ee97f709 am 4c6db059: Merge "Remove the whitelist dictionary." into jb-mr1-dev
* commit '4c6db0592ec121793389c6b90c3094be8dfb58a7':
  Remove the whitelist dictionary.
2012-08-19 22:15:07 -07:00
Jean Chalard 6ce0c23e40 am 04d6649d: Merge "Remove access to the whitelist class." into jb-mr1-dev
* commit '04d6649d295c59a0bbbad3f123606cf28d9f3b61':
  Remove access to the whitelist class.
2012-08-19 22:15:06 -07:00
Jean Chalard 6563ba3b28 am 7bf71ca8: am 753f7b12: Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
* commit '7bf71ca8090208a14716bcbbab992a0d90764cfc':
  Hack to skip reading an outdated binary file.
2012-08-19 22:14:42 -07:00
Jean Chalard 7bf71ca809 am 753f7b12: Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
* commit '753f7b123e721cdb7519f6c4e21b6bb5e6d735b3':
  Hack to skip reading an outdated binary file.
2012-08-19 22:13:37 -07:00
Jean Chalard 4c6db0592e Merge "Remove the whitelist dictionary." into jb-mr1-dev 2012-08-19 22:13:15 -07:00
Jean Chalard 04d6649d29 Merge "Remove access to the whitelist class." into jb-mr1-dev 2012-08-19 22:12:36 -07:00
Jean Chalard 753f7b123e Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev 2012-08-19 22:11:44 -07:00