Commit Graph

8702 Commits (aa07dc58aba0426dfd2464a0edefea793a2d99c7)

Author SHA1 Message Date
Jean Chalard cd7422f4df Merge "Fix a pernicious bug with caps." 2013-10-02 07:59:08 +00:00
Jean Chalard f735117d36 Fix a pernicious bug with caps.
What's happening here is, setAlphabetKeyboard sets the
keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then
restoring the keyboard old state sets it back to UNSHIFTED without
updating it. When we finally know what the correct value is,
we try to set it to UNSHIFTED, but since that's already the currently
recorded state, it skips updating the keyboard forever.

The solution is to avoid setting the shift state without updating the
keyboard.

Bug: 10948582
Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
2013-10-02 16:57:36 +09:00
Satoshi Kataoka 85eba056f2 am c5182c9a: Correspond to the security related API change for PreferenceActivity
* commit 'c5182c9a4ae66e75df8c959bf625d08ef99f81d2':
  Correspond to the security related API change for PreferenceActivity
2013-10-02 00:38:31 -07:00
Satoshi Kataoka c5182c9a4a Correspond to the security related API change for PreferenceActivity
Bug: 10118761
Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
2013-10-02 16:25:07 +09:00
Yuichiro Hanada 4284e9aae7 Make SparseTable have multiple content tables.
Bug: 10920165
Change-Id: Ie9008452ee292fb0b1fec66e2ffed228c4af6c3e
2013-10-02 15:36:13 +09:00
Jean Chalard 0874939e10 am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
* commit 'a8b838b473d4927e6f0483912c45fba929dfb402':
  Fix a test and crash with a better error message when reading
2013-10-01 23:29:35 -07:00
Jean Chalard a8b838b473 Merge "Fix a test and crash with a better error message when reading" 2013-10-02 06:28:06 +00:00
Satoshi Kataoka 319eb1c363 am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit '77144a645f693fd0d73fd2cbe378997c7a339006':
  Retain Emoji Keyboard after rotation
2013-10-01 23:16:44 -07:00
Jean Chalard fa946d4a0f Fix a test and crash with a better error message when reading
When there are too many bigrams, we stop reading the file,
so the file pointer is in an inconsistent place. This means we
have no idea what's going to happen next. It's better to crash
right away.

Change-Id: Id3b7b78cbe4fda3493b3c9c46758763e1ab5f6a3
2013-10-02 11:48:47 +09:00
Satoshi Kataoka 615509cf27 am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
* commit '9d763910580379d3e68b4559f91e655cf05f02a3':
  Unfortunately, hide some broken "emoji"s
2013-10-01 09:52:17 -07:00
Jean Chalard af75e48efd am 74577bed: Merge "Implement the heuristic for auto-commit."
* commit '74577bedb3bb0dabd0e661270f9da0c11c4b0f46':
  Implement the heuristic for auto-commit.
2013-10-01 09:52:15 -07:00
Jean Chalard 6f2830dcb9 am 2afa0e62: Merge "Fix a bug where gesture would delay update."
* commit '2afa0e621eab2ebd7e2bde344dd209308a75dcfc':
  Fix a bug where gesture would delay update.
2013-10-01 09:52:11 -07:00
Ken Wakasa a9f5c55ca2 am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit '382094a784efb32ef9308542ef2f8d2c88ac96b2':
  Cleanup and remove redundant more keys on phones
2013-10-01 09:52:04 -07:00
Ken Wakasa 88c946af0c am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '194c6360554f54d3dfa165427eadda2c7046a65e':
  Swap keys: exclamation, question, period, comma.
2013-10-01 09:51:57 -07:00
Ken Wakasa 1522e7be20 am cc81a93b: Merge "Add skipPtNode to DictDecoders."
* commit 'cc81a93b01cbcada13c3791fa5ba73a09ba7e092':
  Add skipPtNode to DictDecoders.
2013-10-01 09:51:53 -07:00
Satoshi Kataoka 98da7cfc0b am c2dda795: Tentatively revert inconsistent assets
* commit 'c2dda795af14f94db7b6cfc80cbc609c20406522':
  Tentatively revert inconsistent assets
2013-10-01 09:51:51 -07:00
Satoshi Kataoka db083a2b25 am a4913994: Hide indication bar if only one page
* commit 'a4913994c2904eefa861782966a288959b216713':
  Hide indication bar if only one page
2013-10-01 09:51:50 -07:00
Keisuke Kuroyanagi d00e48656b am 126d758c: Merge "Quit blocking getSuggestion during GC."
* commit '126d758c1e8db969ad1c9e5d801f3075e2061cc1':
  Quit blocking getSuggestion during GC.
2013-10-01 09:51:43 -07:00
Jean Chalard bff2d14d1c am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
* commit '74730a4600620b5ccfcf3d16666ad0239aec18b6':
  Create the wiring for auto-commit confidence computation.
2013-10-01 09:51:41 -07:00
Satoshi Kataoka 5ceae026e0 Retain Emoji Keyboard after rotation
Bug: 10612450
Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
2013-10-01 22:59:02 +09:00
Satoshi Kataoka 9d76391058 Merge "Unfortunately, hide some broken "emoji"s" 2013-10-01 12:18:13 +00:00
Jean Chalard 74577bedb3 Merge "Implement the heuristic for auto-commit." 2013-10-01 12:10:57 +00:00
Satoshi Kataoka c7e6f3dbc3 Unfortunately, hide some broken "emoji"s
Bug: 10923117
Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
2013-10-01 21:02:59 +09:00
Jean Chalard 459cd6f8ef Implement the heuristic for auto-commit.
Bug: 9059617
Change-Id: I066abf018df5aaeabf415425dd822ebe233e6008
2013-10-01 21:00:40 +09:00
Jean Chalard 2afa0e621e Merge "Fix a bug where gesture would delay update." 2013-10-01 11:21:59 +00:00
Jean Chalard b1e6eeea57 Fix a bug where gesture would delay update.
Change-Id: I94c394f45f2717bc1a4b95692a5757c1e7179152
2013-10-01 20:06:36 +09:00
Ken Wakasa 382094a784 Merge "Cleanup and remove redundant more keys on phones" 2013-10-01 10:29:15 +00:00
Ken Wakasa 194c636055 Merge "Swap keys: exclamation, question, period, comma." 2013-10-01 10:03:08 +00:00
Ken Wakasa e56c2f979f Cleanup and remove redundant more keys on phones
Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
2013-10-01 19:02:09 +09:00
Ken Wakasa b23a67529b Swap keys: exclamation, question, period, comma.
bug: 11003945
Change-Id: If9ff0487ebbb1c25c8b13eaa55615255921c61c6
2013-10-01 18:35:41 +09:00
Ken Wakasa cc81a93b01 Merge "Add skipPtNode to DictDecoders." 2013-10-01 09:06:39 +00:00
Satoshi Kataoka c2dda795af Tentatively revert inconsistent assets
Change-Id: I90f0ffed57f0efa9f01adb969fd499e2dcd2a0dc
2013-10-01 17:53:04 +09:00
Yuichiro Hanada bc4926235d Add skipPtNode to DictDecoders.
Change-Id: I042ff041b68572182c87dc87db6a6aa2bbbefc6c
2013-10-01 17:21:21 +09:00
Satoshi Kataoka a4913994c2 Hide indication bar if only one page
Bug: 10923117
Change-Id: If81bf07ba2e7c4fff44a8832f98b4a393c15edc7
2013-10-01 16:58:42 +09:00
Keisuke Kuroyanagi 126d758c1e Merge "Quit blocking getSuggestion during GC." 2013-10-01 07:08:11 +00:00
Jean Chalard 74730a4600 Merge "Create the wiring for auto-commit confidence computation." 2013-10-01 06:58:16 +00:00
Jean Chalard bb57090f1d Create the wiring for auto-commit confidence computation.
Bug: 9059617
Change-Id: I7e4e05ffa8c68cfebbe362a977fd176555cad12a
2013-10-01 15:04:15 +09:00
Keisuke Kuroyanagi 03cb8f751a Quit blocking getSuggestion during GC.
Bug: 10831272

Change-Id: I995c619dc18a9120a47f547d31045cb73a9353ec
2013-10-01 12:04:06 +09:00
Baligh Uddin 3efc5b6b99 Import translations. DO NOT MERGE
Change-Id: I8f0db70d71967d115f0684a7661888aa31e751d4
Auto-generated-cl: translation import
2013-09-30 19:06:56 -07:00
Baligh Uddin 985e6d7fc9 Import translations. DO NOT MERGE
Change-Id: I01400792a62f3f5bb11794b32930e788fa0af045
Auto-generated-cl: translation import
2013-09-30 19:01:45 -07:00
Alan Viverette 1e2543f125 am 458fb52b: Merge "Speak auto-corrections for accessibility"
* commit '458fb52b985d9c4f37b82689b573d42f95487a32':
  Speak auto-corrections for accessibility
2013-09-30 11:16:36 -07:00
Alan Viverette 458fb52b98 Merge "Speak auto-corrections for accessibility" 2013-09-30 18:14:13 +00:00
Keisuke Kuroyanagi 12d3bd228d am 65330d28: Merge "Implement simple dictionary decay."
* commit '65330d2820f61aaad6094db6738017aa77a64581':
  Implement simple dictionary decay.
2013-09-30 05:01:49 -07:00
Keisuke Kuroyanagi 65330d2820 Merge "Implement simple dictionary decay." 2013-09-30 11:56:15 +00:00
Keisuke Kuroyanagi fd02b2d6ee Implement simple dictionary decay.
Groundwork and implement simple decay.
Increment probability when typed and decrement probability
at GC.

Bug: 6669677

Change-Id: Ib12caead0cbeef4ce7808fe8ac0b00ee331523fe
2013-09-30 20:53:35 +09:00
Keisuke Kuroyanagi a4c73066d7 am ef084229: Merge "Use reentrant lock for main dictionaries."
* commit 'ef084229f646853cff4eef55e2069eb4b93f14e6':
  Use reentrant lock for main dictionaries.
2013-09-30 02:27:16 -07:00
Keisuke Kuroyanagi ef084229f6 Merge "Use reentrant lock for main dictionaries." 2013-09-30 09:25:54 +00:00
Keisuke Kuroyanagi 3e6275634b Use reentrant lock for main dictionaries.
Bug: 10964805
Change-Id: Iaa9b79fc770d8ae2ec9d7c362c90c28bc9f65ea8
2013-09-30 18:16:29 +09:00
Jean Chalard 90f74e23f7 am 42941dd2: Merge "Update dictionaries"
* commit '42941dd2fd2a6b3a89cbb7ab733980465b4895a6':
  Update dictionaries
2013-09-30 01:38:38 -07:00
Jean Chalard 42941dd2fd Merge "Update dictionaries" 2013-09-30 08:36:35 +00:00
Ken Wakasa af5511c830 am 25f47828: Merge "Separate bigram entries from the trie file."
* commit '25f47828539f4af34b081afb4553e9e56fbcdbf3':
  Separate bigram entries from the trie file.
2013-09-30 01:02:30 -07:00
Ken Wakasa 25f4782853 Merge "Separate bigram entries from the trie file." 2013-09-30 08:00:01 +00:00
Yuichiro Hanada fd46e87da2 Separate bigram entries from the trie file.
Bug: 10920165
Change-Id: I42eb7f228994a56c2f31a1c83904c8c360b6d088
2013-09-30 16:42:42 +09:00
Ken Wakasa 2b73561cd7 am d40a931a: Merge "Change scopes of some methods in DynamicBinaryDictIOUtils."
* commit 'd40a931a4d9ab6e49e6d8689f2087937ea168147':
  Change scopes of some methods in DynamicBinaryDictIOUtils.
2013-09-30 00:18:59 -07:00
Ken Wakasa d40a931a4d Merge "Change scopes of some methods in DynamicBinaryDictIOUtils." 2013-09-30 07:17:38 +00:00
Jean Chalard a267ebed5a Update dictionaries
Add KitKat to all dictionaries.
Version
da, fi, pl : 29 → 40
cs, de, hr, it, lt, lv, nb, nl, sl, sr, sv, tr : 35 → 40
es : 36 → 40
en_gb, en_us, en, fr, pt_br, pt_pt : 39 → 40

Bug: 10958192
Change-Id: I14436616285ced5eb3b70b8c44b9243da94eed4f
2013-09-30 07:12:03 +00:00
Keisuke Kuroyanagi 0aaf42b4ca am c1851004: Prepare dictionary decay.
* commit 'c18510049a3422c88ed3ab3bbc64944c94a611fd':
  Prepare dictionary decay.
2013-09-29 22:18:00 -07:00
Keisuke Kuroyanagi c18510049a Prepare dictionary decay.
Bug: 6669677
Change-Id: I8fbae190dd44a6bdbee7e9b6d3a16208322727f7
2013-09-30 13:57:54 +09:00
Yuichiro Hanada dc4f357f6b Change scopes of some methods in DynamicBinaryDictIOUtils.
Change-Id: I1371d41760b38834d1d5ff40e682ac0a6fc9f2e9
2013-09-30 11:32:07 +09:00
Keisuke Kuroyanagi f2800fc6f4 am 1cf4789b: Merge "Set header attributes for ExpandableBinaryDictionary."
* commit '1cf4789ba6abb5855392d542bb075c12d2d9b6a0':
  Set header attributes for ExpandableBinaryDictionary.
2013-09-28 22:16:07 -07:00
Keisuke Kuroyanagi 1cf4789ba6 Merge "Set header attributes for ExpandableBinaryDictionary." 2013-09-29 05:14:22 +00:00
Satoshi Kataoka 9c6e7e233e am b0c5ddb9: Merge "Stop vibration while repeating delete key in emoji view"
* commit 'b0c5ddb9c7a27f71ab63ec3362a476ec052f5bd0':
  Stop vibration while repeating delete key in emoji view
2013-09-28 03:40:24 -07:00
Satoshi Kataoka b0c5ddb9c7 Merge "Stop vibration while repeating delete key in emoji view" 2013-09-28 10:37:57 +00:00
Satoshi Kataoka d0df68e6cb Stop vibration while repeating delete key in emoji view
Bug: 10960355
Change-Id: Ic1fdecdbcab4082c5383623c1f2575e3976ebe27
2013-09-28 17:02:58 +09:00
Keisuke Kuroyanagi 5ed30a7660 Set header attributes for ExpandableBinaryDictionary.
Bug: 6669677

Change-Id: I2462777eaa07600f1c774226adfc4f351882f523
2013-09-28 12:50:09 +09:00
Baligh Uddin 12d095eae8 Import translations. DO NOT MERGE
Change-Id: I4def1991a7133c4ea653882044bf6c7a49dcbcfd
Auto-generated-cl: translation import
2013-09-27 15:37:59 -07:00
Alan Viverette 67319f92f3 Speak auto-corrections for accessibility
BUG: 8669376
Change-Id: Id71b2c2835daa7a8c9d6c92c57a7e302551c289d
2013-09-27 14:15:53 -07:00
Satoshi Kataoka 6f855d0629 am a6e2ec53: Merge "Reduce Emoji size"
* commit 'a6e2ec53b6f46491bd23bda6a0d734b820fd8a01':
  Reduce Emoji size
2013-09-27 10:26:47 -07:00
Satoshi Kataoka a6e2ec53b6 Merge "Reduce Emoji size" 2013-09-27 17:24:58 +00:00
Satoshi Kataoka b44efbdcc0 Reduce Emoji size
Change-Id: Ie9dec82c0edde70a75fffeb7c86c14e05f468207
2013-09-28 02:02:47 +09:00
Satoshi Kataoka 36301d555f am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"
* commit '4dc2b9131f48df86e071e5ecfc8db7cd408b154e':
  Fix possible NPE in KeyboardSwitcher
2013-09-27 09:54:38 -07:00
Satoshi Kataoka 4dc2b9131f Merge "Fix possible NPE in KeyboardSwitcher" 2013-09-27 16:52:32 +00:00
Satoshi Kataoka adbb979b56 Fix possible NPE in KeyboardSwitcher
Bug: 10964306
Change-Id: Ibcea76da746f6cac92c8d91425d25d04ade62af0
2013-09-28 01:19:18 +09:00
Keisuke Kuroyanagi de12fcb0f2 am 8b580819: Merge "Add unigram/bigram counting."
* commit '8b580819a580527418ba96f1a7cda699bff772ba':
  Add unigram/bigram counting.
2013-09-27 07:17:37 -07:00
Keisuke Kuroyanagi 8b580819a5 Merge "Add unigram/bigram counting." 2013-09-27 14:14:49 +00:00
Keisuke Kuroyanagi 31097a57cc Add unigram/bigram counting.
Bug: 6669677
Change-Id: I05ea2201d822dddf062b08c8467daa336760e16c
2013-09-27 23:12:12 +09:00
Keisuke Kuroyanagi be6076b050 am e74d4a18: Stop reading dictionary while regenerating.
* commit 'e74d4a184bbd06ddb607f81147ed827b9dd1ba17':
  Stop reading dictionary while regenerating.
2013-09-27 06:01:38 -07:00
Keisuke Kuroyanagi e74d4a184b Stop reading dictionary while regenerating.
Bug: 10831272

Change-Id: Iead7268a9371b48d729a5f65074ccbc05f3185db
2013-09-27 21:44:26 +09:00
Jean Chalard 4ac33aca69 am b7dfacd3: Merge "Send backspace as an event when TYPE_NULL."
* commit 'b7dfacd31e894247ee2523f250dbadc06dd0bf4b':
  Send backspace as an event when TYPE_NULL.
2013-09-27 01:02:01 -07:00
Jean Chalard b7dfacd31e Merge "Send backspace as an event when TYPE_NULL." 2013-09-27 08:00:43 +00:00
Yuichiro Hanada 1e886ac5b6 am a328f538: Fix PrioritizedSerialExecutor.
* commit 'a328f538c34ad2dafdfa53642085cb1072224d80':
  Fix PrioritizedSerialExecutor.
2013-09-27 00:58:49 -07:00
Jean Chalard de814ec0ec Send backspace as an event when TYPE_NULL.
This is not enough to really fix behavior with TYPE_NULL,
but it does make things a bit better.

Bug: 10949594
Change-Id: Ia359f781cdd76a2e2c5a4c9f166025d81b931174
2013-09-27 16:55:12 +09:00
Yuichiro Hanada a328f538c3 Fix PrioritizedSerialExecutor.
It was possible that fetchNextTasks() would be called by multiple
threads concurrently.
If it happens, some tasks in the task queues might be ignored.

Change-Id: Idc81c43c45e382da3850cc55b9a42c281548d2a8
2013-09-27 16:46:34 +09:00
Yuichiro Hanada 704ab0f6ae am 781feb74: Remove unused methods.
* commit '781feb748cc59d3d34e9b52553cac192f1699dce':
  Remove unused methods.
2013-09-26 21:00:24 -07:00
Yuichiro Hanada 781feb748c Remove unused methods.
Change-Id: I542db0c717c0bc05c8baa08f1e9db0a05946a99b
2013-09-27 12:34:38 +09:00
Baligh Uddin 45de3925d8 Merge "Import translations. DO NOT MERGE" 2013-09-26 15:02:33 +00:00
Jean Chalard bf3e508ddd am 2fc0c422: Merge "Update dictionaries"
* commit '2fc0c4224bad805e85d09fedea8a9a4719523477':
  Update dictionaries
2013-09-26 05:57:54 -07:00
Keisuke Kuroyanagi 0ae51a5e62 am e3e10317: Merge "Create empty dictionary file in native code."
* commit 'e3e10317b0e5c02ea95eea0100ab696e9c928f36':
  Create empty dictionary file in native code.
2013-09-26 05:57:48 -07:00
Yuichiro Hanada 11cccb569f am d188af70: Add SparseTable.
* commit 'd188af70227ae7003fa410ccf4038a57825ae385':
  Add SparseTable.
2013-09-26 05:57:46 -07:00
Ken Wakasa 84f6b2c0ee am 5f8eba02: Merge "Revert inconsistent assets"
* commit '5f8eba02d0c42a8e6e3dbc272d2a6156c6a74d3b':
  Revert inconsistent assets
2013-09-26 05:57:38 -07:00
Jean Chalard 2fc0c4224b Merge "Update dictionaries" 2013-09-26 09:05:00 +00:00
Jean Chalard 50b36e2a4b Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1374721653 <=> 1380099152
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10
Added: draft 138

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1374721654 <=> 1380099152
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1374721663 <=> 1380099172
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1376888819 <=> 1380099153
  version : 37 <=> 39
Body :
Added: septembre 150

>>> dictionaries/pt_BR_wordlist.combined.gz
Header :
  date : 1376884524 <=> 1380099168
  version : 37 <=> 39
Body :
Freq changed: atras 87 -> 0
Not a word: atras false -> true
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: cafe café 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15

>>> dictionaries/pt_PT_wordlist.combined.gz
Header :
  date : 1376884536 <=> 1380099168
  version : 37 <=> 39
Body :
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15
Added: cafe 0

>>> java/res/raw/main_en.dict
Header :
  date : 1374721663 <=> 1380099172
  version : 36 <=> 39
Body :
Freq changed: gay 127 -> 10

>>> java/res/raw/main_fr.dict
Header :
  date : 1376888819 <=> 1380099153
  version : 37 <=> 39
Body :
Added: septembre 150

>>> java/res/raw/main_pt_br.dict
Header :
  date : 1376884524 <=> 1380099168
  version : 37 <=> 39
Body :
Freq changed: atras 87 -> 0
Not a word: atras false -> true
Shortcut added: atras atrás 15
Shortcut added: cade cadê 15
Shortcut added: cafe café 15
Shortcut added: ferias férias 15
Shortcut added: musica música 15
Shortcut added: musicas músicas 15

Bug: 10504313
Bug: 10507536
Bug: 10561100
Change-Id: I4267c76cf0de221a703523d5f2dd2befbaf020a0
2013-09-26 08:34:53 +00:00
Keisuke Kuroyanagi e3e10317b0 Merge "Create empty dictionary file in native code." 2013-09-26 08:03:38 +00:00
Baligh Uddin f13b168c22 Import translations. DO NOT MERGE
Change-Id: I98ca117f651330bfa7eafbf7f7196cf3780c4ef1
Auto-generated-cl: translation import
2013-09-26 00:57:28 -07:00
Yuichiro Hanada d188af7022 Add SparseTable.
Bug: 10920165
Change-Id: I749dd0269e788799e30b10beb2671813d40ce15f
2013-09-26 16:16:30 +09:00
Ken Wakasa 5f8eba02d0 Merge "Revert inconsistent assets" 2013-09-26 06:10:46 +00:00
Satoshi Kataoka d4cae4fab3 Revert inconsistent assets
Bug: 10786040

Change-Id: Ic9ead001879d7b5ff0b85529dd0c9afdbe2f7478
2013-09-26 14:52:52 +09:00
Keisuke Kuroyanagi 5ef6209656 Create empty dictionary file in native code.
Bug: 6669677
Change-Id: I46d23deee1fd091678f4593561cb8687eb815212
2013-09-26 12:59:02 +09:00
Ken Wakasa 6c0e48b1ad am 4350a93a: Merge "Fix the offdevice regression test build"
* commit '4350a93aa5447f92304bea3f8bbf00bbf6c35498':
  Fix the offdevice regression test build
2013-09-25 08:10:08 -07:00
Keisuke Kuroyanagi a2174bad22 am 5fa96540: Merge "Clear traverse sessions when closing."
* commit '5fa96540456f172b6dbbefe45061738916915cbb':
  Clear traverse sessions when closing.
2013-09-25 08:10:07 -07:00