Jean Chalard
|
7580518138
|
am f0ad08f1: am be8574e2: am c49cccc0: am fde684e8: am a18a6fd8: am e4a446d2: am e13d3a28: am 7d4030b7: am 2282fcec: am 29177deb: am 114ec4ac: am 71d52474: Merge "Optimizations and safeguards."
* commit 'f0ad08f1666fc056daae44e532a3cfd47267dcfb':
|
2013-10-09 19:51:24 -07:00 |
|
Jean Chalard
|
7b89a68eb0
|
am 5092286c: am 9a407ed4: am ba8a511d: am 500fee82: am 0cb45b13: am 8e2ed792: am 17f3ea05: am bfbdfdd4: am 27f3cf5b: am c990ed5e: am 502c041e: am 5064ac88: Merge "Be careful about the dictionary size in detection methods"
* commit '5092286cae5a64fa8d604c48e4383fafdf710bf8':
|
2013-10-09 19:51:22 -07:00 |
Satoshi Kataoka
|
b1fc756533
|
am dcf56743: am 82dfba1b: am d92342c6: am 63be2c22: am 8dc46f7c: am 5487339a: am e6290166: am 829689b0: am 0d997c3f: am e3ca68aa: am 9e5d7abe: am eab27c1e: Merge "Add account e-mail addresses to the user dictionary"
* commit 'dcf56743d7478975a37c1fa2a83bf19613dd6560':
|
2013-10-09 19:51:19 -07:00 |
Tadashi G. Takaoka
|
b40a39f368
|
am e64b903e: am 0e10dc13: am 3e539be3: am 2dcd913e: am 13acdc83: am 560bfd37: am 6b496cbf: am d2286217: am fcb64160: am bd2aca0b: am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
* commit 'e64b903e9a78dee86449b25d34fb737976437217':
|
2013-10-09 19:51:16 -07:00 |
|
Satoshi Kataoka
|
dc46142e23
|
am adf05a7c: am 39b01d5b: am bf0eb320: am 9908bc5d: am 4f799337: am 4773a545: am d2ee864e: am d993f92f: am fe55e380: am 1c7a15b5: am eecf34a9: am faa94a2d: Merge "Add owner\'s info to the dictionary"
* commit 'adf05a7c8f8d205eabe03c5edd06966bbaeeb8a0':
|
2013-10-09 19:51:13 -07:00 |
|
Satoshi Kataoka
|
610428b778
|
am 2a22ab19: am 20599a75: am 89f7f9e3: am 81e6447b: am 3de6e07c: am 9a1be285: am b28f4032: am ec2f54e9: am fbe55eae: am 7fdd3431: am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"
* commit '2a22ab19594429dc5db2df8af0c7a3a9b6c9af73':
|
2013-10-09 19:51:10 -07:00 |
|
Satoshi Kataoka
|
7ad301e27c
|
am d83d5991: am 568e59d6: am ec786ec2: am d5516fdc: am 0e5797da: am 7121a6cd: am a8df42de: am 0c85a795: am d87fce38: am 7e5e4c85: am fe856be8: am f59c4f68: Fix labels in the personal dictionary settings
* commit 'd83d59911de5aaeaa6089f9a8b5289d394486d31':
|
2013-10-09 19:51:06 -07:00 |
|
Satoshi Kataoka
|
db45038c33
|
am a85ce645: am c053c4b6: am e598a373: am 437d064c: am 7c992669: am 5a7849c2: am 87cfcbcf: am c1381be0: am e93eb247: am a5f0a52d: am 778eabfe: am 244a24e3: Consolidate dummy proximity info to the spell checker info
* commit 'a85ce645e646ade1e282eec6638b2ff47628d139':
|
2013-10-09 19:51:03 -07:00 |
Kurt Partridge
|
9789662a7c
|
am 2b615b08: am 4db935ea: am 1070a50e: am 318b1dfe: am 7b39521c: am 5c043059: am 20930824: am 59a29cea: am c976add2: am 8facddba: am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."
* commit '2b615b080469da5d9be25889fc499a70da7f53ff':
|
2013-10-09 19:51:01 -07:00 |
Baligh Uddin
|
bea6162e32
|
am 6aa6fae6: am 2146f5c2: am a9a34eb7: am e665c718: (-s ours) am 6420c48c: (-s ours) am 2c43155c: (-s ours) am 4dfe55ff: (-s ours) am bad5fbcb: (-s ours) am 1e6135e2: (-s ours) am 517f7865: (-s ours) am f7937a94: am 542bcbea: (-s ours) am 71778d25: (-s ours) am 34a0dc
* commit '6aa6fae6fdec5984a4e1120116e1133e341573ab':
|
2013-10-09 19:50:59 -07:00 |
|
Tadashi G. Takaoka
|
83bbc17f84
|
am de0a63f5: am 74909ea4: am 41d9880b: am 661ce373: am 5cdd3721: am bdfc8fbd: am ef8d9d5c: am 007bdf71: am 9f9f296c: am 3c382888: am d2dbbc41: am 104bb70c: Merge "Avoid drawing too long gesture preview trails"
* commit 'de0a63f52ebcbca6c0ba5e0756a17099861b4234':
|
2013-10-09 19:50:56 -07:00 |
|
Jean Chalard
|
7a2532d639
|
am 9d2515de: am bf0d5bde: am cf9c1673: am 3069f0c3: am 6e83eeb4: am 8e0bb7f3: am d41ba9d4: am 411adbbf: am d19704ed: am d942e6e6: am 0633a208: am 2afe88b8: Merge "Unify space-adding on gestures."
* commit '9d2515de39340b207532007b4ab7800dea7dcc0b':
|
2013-10-09 19:50:53 -07:00 |
Keisuke Kuroynagi
|
8c9a74abba
|
am 1230d882: am 4b68dc9f: am 6ef7e74b: am 4040ecc1: am d5ca85da: am 815e65f8: am 1e16eeda: am 0bb918e5: am d320f201: am 06579eda: am 86af3e9f: am b90a86b3: Merge "Checking key edit distance of candidate words for gesture scoring."
* commit '1230d8821e45b88a579b04beb11ac84936a795dc':
|
2013-10-09 19:50:51 -07:00 |
|
Satoshi Kataoka
|
03edc2d4d5
|
am 465b007f: am a30b4c3d: am 02d90683: am 26c610a1: am b5f3e514: am 8d85524f: am 36118a2d: am 41c423f9: am dd1a8597: am 4334809f: am 1e7c0677: am a9dd74cf: refactor spell checker
* commit '465b007ff7094f687f87b4604a2ede4f79766e84':
|
2013-10-09 19:50:48 -07:00 |
|
Tadashi G. Takaoka
|
044fe60783
|
am 4a076c52: am 09036b2b: am 9cf267ab: am d349453d: am bfcd43ca: am 20acd22d: am bb366847: am 18e6f5fd: am ae0f9e73: am 55b98d25: am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
* commit '4a076c527c9c8002e6fe49560ad058de891cb322':
|
2013-10-09 19:50:44 -07:00 |
|
Tadashi G. Takaoka
|
ba27a84051
|
am 9e207a98: am fe929763: am 7909ad43: am 62268189: am 3449a2d8: am bb978fe5: am 36bb8a9c: am 3a20d7ab: am d7ed39f6: am 710a12e3: am d192dd94: am 84ac8f31: Move empty listner to KeyboardActionListener.Adapter
* commit '9e207a9828bfd21cf8827e102d5929fb97d2a4f7':
|
2013-10-09 19:50:41 -07:00 |
|
Tadashi G. Takaoka
|
0043af6744
|
am 622a92a3: am 131f6933: am 4eaf6142: am 8a20bea5: am 3f5daa0f: am 82a3df5b: am f3c28421: am 99f977c4: am 734617db: am 066a445f: am 0500edcc: am 40eb31be: Merge "Clean up unused static variable"
* commit '622a92a33a89fa5984defdedfe246c5fa1dc6076':
|
2013-10-09 19:50:38 -07:00 |
|
Satoshi Kataoka
|
b2933098d3
|
am 55d216ff: am abb479e9: am ecbcbee0: am 3f06f11f: am e9c7c297: am c3cc8fd3: am 06edf269: am 132d8910: am 33dac33f: am c8187713: am 221d37d7: am d430c92d: Merge "Fix exact match profanity"
* commit '55d216ffec9f9d02a6d8208ca5615c841254b693':
|
2013-10-09 19:50:34 -07:00 |
|
Tadashi G. Takaoka
|
41867718c4
|
am 935f8854: am 31064eb1: am b475ee42: am 2cd524b6: am 69892196: am f4130842: am 80877f52: am eae16583: am cadb19e3: am bbc91a06: am c8dcf48e: am ce67b416: Record down point as gesture preview trail for sure
* commit '935f885427da7775cd31c56414ff778abce03ea3':
|
2013-10-09 19:50:32 -07:00 |
|
Tadashi G. Takaoka
|
0bc149a4fb
|
am 05641a56: am fd380549: am 605febc6: am 368ee87a: am ac1c9b25: am 6d7fcf2b: am e25f6ef1: am 7018cced: am d227ab29: am 7afc241d: am 7a926b3c: am 4ddf1e47: Remove unused gesture preview trail code
* commit '05641a561c878dfe154ea11f1d15fd7853428d5e':
|
2013-10-09 19:50:28 -07:00 |
|
Baligh Uddin
|
e0d8f760f8
|
am 8bbbd145: am 87e80122: am 5c272208: (-s ours) am d90eaddd: (-s ours) am f5def65b: (-s ours) am a0ae25fe: (-s ours) am ea705d86: (-s ours) am d887218a: (-s ours) am c9ac1129: (-s ours) am 51d694fb: (-s ours) am 83973d45: am c7588446: (-s ours) Merge "Import translat
* commit '8bbbd145d5d66439e18f936a5ada13b14460040c':
|
2013-10-09 19:50:25 -07:00 |
|
Baligh Uddin
|
8bd6b343b2
|
am 3c00b411: am e7ce2264: (-s ours) am 86022aea: (-s ours) am f4d8953d: (-s ours) am caa6559a: (-s ours) am 01e02bc0: (-s ours) am 894f0dd9: (-s ours) am c97c335b: (-s ours) am dff92757: (-s ours) am e29d2e82: (-s ours) am eb4f9744: (-s ours) Merge "Import translation
* commit '3c00b41125f10070bb5ec346651bd05c1e3c7594':
|
2013-10-09 19:50:21 -07:00 |
|
Baligh Uddin
|
ab7873c249
|
am a8b10246: am d77fabbd: am 4c93f0d4: am b2675eab: (-s ours) am 4af94918: (-s ours) am f33c0f4d: (-s ours) am da57c7ec: (-s ours) am 9a12a8a8: (-s ours) am 56fc9418: (-s ours) am 6d4914c7: (-s ours) am b9efe4b5: am 458bfeea: (-s ours) am a8478986: (-s ours) am b55b15
* commit 'a8b10246335e602f3087561459dee7d9153cf28a':
|
2013-10-09 19:50:19 -07:00 |
|
Baligh Uddin
|
611546036a
|
am b3cb0018: am 185a8a6b: (-s ours) am 341ed610: (-s ours) am 2add0c4a: (-s ours) am 4d1fb901: (-s ours) am 97bf8615: (-s ours) am 97f41e33: (-s ours) am 09ba54ac: (-s ours) am 61154e65: (-s ours) am 69a861b1: (-s ours) am b7065916: am dd8197bc: (-s ours) Import trans
* commit 'b3cb0018b69bb801876dfa5881d8e0e585a69dd6':
|
2013-10-09 19:50:16 -07:00 |
|
Baligh Uddin
|
c0ea2b7c88
|
am 33c5c222: am 31e530f1: (-s ours) am 607330c0: (-s ours) am efaf5628: (-s ours) am 205b13a5: (-s ours) am 3f38b651: (-s ours) am 961823f6: (-s ours) am a2df2655: (-s ours) am ae71c5b0: (-s ours) am f3cfc524: (-s ours) am 6939f8dc: (-s ours) Import translations. DO N
* commit '33c5c22239e0f45e25d93e55a77575dc42af073c':
|
2013-10-09 19:50:13 -07:00 |
Ken Wakasa
|
d8f59a22fe
|
am 94fa785f: am e8add6a7: am 025bccfe: am 4dc923a0: am 92222c0a: am 0fd373ee: am 863e281d: am db3591a8: am df354cb1: am 6c97d676: am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit '94fa785fcb5adefad476337b53f0dede602b4d17':
|
2013-10-09 19:50:09 -07:00 |
|
Tadashi G. Takaoka
|
e30f00fd98
|
am 784ea595: am 80703bbd: am f1a2a974: am 1da1feda: am e5a34868: am b4c9cc63: am d6e17195: am 3fe6c4f4: am 3792fa4b: am 4e8fde00: am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit '784ea5955f704c955ba50d19fd13e2f8a51c9011':
|
2013-10-09 19:50:06 -07:00 |
|
Tadashi G. Takaoka
|
2f767467f9
|
am f28d2fd7: am e497a1e3: am 268d298a: am 4bd7d179: am 4ffc9322: am 2097f0d4: am 4dd37bb7: am 4565c8b2: am db92fe62: am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit 'f28d2fd76462498bd7baf46e143c8baa23b8562c':
|
2013-10-09 19:50:03 -07:00 |
|
Tadashi G. Takaoka
|
18e39765bd
|
am a847241d: am edb14be9: am 72cdf3ea: am a390047b: am fef4c342: am 41466ebc: am aac0783f: am 13afe2ca: am 503ab45a: am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit 'a847241d544cac9f0ce3c9efa290363922ffb033':
|
2013-10-09 19:50:00 -07:00 |
|
Baligh Uddin
|
5e5eb38c67
|
am 59212e9b: am 3497dd42: am 9e98458a: am 158b3c2c: am 31b3a24f: (-s ours) am 6fa88d6e: (-s ours) am d1864bac: (-s ours) am deeaf9ae: (-s ours) am da33179c: (-s ours) am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e405
* commit '59212e9bbc0a2ca6f600b89b7b2185e35e02fffa':
|
2013-10-09 19:49:58 -07:00 |
|
Baligh Uddin
|
986ffb1ed9
|
am d8ab4a4f: am fbcaa181: am a0ba17eb: (-s ours) am d7903e25: (-s ours) am 0c64b713: (-s ours) am 6459733a: (-s ours) am 3d7c4cc1: (-s ours) am bdf7113c: (-s ours) am c7f37218: (-s ours) am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ours) Merge "Import translat
* commit 'd8ab4a4f2b072c30d8bb587fe53b8ceea435c60b':
|
2013-10-09 19:49:55 -07:00 |
|
Baligh Uddin
|
4748dde7e7
|
am eb19da16: am abe3f2ff: (-s ours) am d72b5944: (-s ours) am 1110bd5d: (-s ours) am 5ee45793: (-s ours) am cf904030: (-s ours) am 5a8c2fac: (-s ours) am 62bf6fa5: (-s ours) am 0ffe46a1: (-s ours) am a8fb8b4b: (-s ours) am e351e10a: Merge "Import translations. DO NOT
* commit 'eb19da167421de4fe3f68d1737649d81fcb27800':
|
2013-10-09 19:49:53 -07:00 |
|
Baligh Uddin
|
d0ff18cafc
|
am d72a28a2: am a047d6c7: (-s ours) am e1fd5de3: (-s ours) am 4fe1f32a: (-s ours) am 95be27fd: (-s ours) am 70a09b36: (-s ours) am 5aab3bb3: (-s ours) am d72c805d: (-s ours) am a2942457: (-s ours) am 168d43d7: (-s ours) am dde8e9e3: (-s ours) Merge "Import translation
* commit 'd72a28a2c3b236e64ac70e9a4a1c79cfe0fc5700':
|
2013-10-09 19:49:50 -07:00 |
|
Tadashi G. Takaoka
|
af17808c1e
|
am f986d323: am 5d0647e3: am efd0cfb8: am 7e9672cf: am 25cbda13: am d19e8451: am 801a8876: am 59b93354: am 2a06798e: am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit 'f986d32301311d5761a32c1f06876c5702983518':
|
2013-10-09 19:49:47 -07:00 |
|
Satoshi Kataoka
|
26997ed55d
|
am 0f7b2041: am 25646cd3: am 290be747: (-s ours) am ee96815b: (-s ours) am c7f05e44: am acfbfcbe: (-s ours) am c6d49148: (-s ours) am 8fad5d83: (-s ours) am 6f9617ab: (-s ours) am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5daf660: (-s ours) am 684542
* commit '0f7b2041c8f0adc185ceafe7a147167b16f8a9f5':
|
2013-10-09 19:49:45 -07:00 |
|
Jean Chalard
|
cf532af6dd
|
am 0d0489d1: am 12fead22: am 51ed7879: am 6b62c6e9: am 94018741: am b4d9d140: am 6bee71b3: am d0981b0f: am 771b60ba: am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit '0d0489d156fc20638357aa06e8730b1e7dfd4919':
|
2013-10-09 19:49:41 -07:00 |
|
Ken Wakasa
|
1b56e1a74c
|
am 8052549e: am 36e5a5ce: am c31ce3a5: am 122e4514: am 18c95594: am 1fd7d6b9: am 5b04d8b5: am 43d34fb8: am af1196dd: am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit '8052549e693c52cbe0dba280fc6c7af4b626409a':
|
2013-10-09 19:49:38 -07:00 |
|
Satoshi Kataoka
|
c1821fbcda
|
am bdfafecb: am ef59fb91: am e5f448bb: am 7438e6bc: am ef95a3d0: am 17c8d766: am ee180b02: am f00f84a7: am 679bff89: am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit 'bdfafecb96a317a2f7da89dacadb478b066d9a6c':
|
2013-10-09 19:49:35 -07:00 |
|
Jean Chalard
|
5f0dbdc515
|
am b6f3e6ee: am e8707d37: am 556601dc: am 143e6f2d: am dd199e6b: am 6adf817f: am fb238e46: am 0c179788: am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit 'b6f3e6ee094014551b6fcaa922fe84a8a5bb13b6':
|
2013-10-09 19:49:32 -07:00 |
|
Baligh Uddin
|
f3aee4ad42
|
am 42b9f1fc: am d990ab52: am aa13c1f0: am 909cbd1f: am e3923e65: am 28685e72: am 7ed4f366: am 6dcfbae4: am 4827a249: am c363302e: Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit '42b9f1fcfc44ac9410a2530f1d5bc87b9258f20d':
|
2013-10-09 19:49:28 -07:00 |
|
Tadashi G. Takaoka
|
5e9ff77f85
|
am 959fb50f: am fd46ed1d: am e11061e4: am 747372d5: am d89d9136: am ce5aedf7: am 18ece47e: am fe4cdd12: am 8923d767: am 1e08d3d2: am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit '959fb50f3d5a660d130c3b1ef6129e16e1289e3d':
|
2013-10-09 19:49:25 -07:00 |
|
Satoshi Kataoka
|
792f1db816
|
am ca02610e: am b87f034d: am 5568ca2a: am c4c5d046: am 802d8334: am 50704547: am 4e90125e: am 07806b03: am 1749dba1: am d53fb22a: am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit 'ca02610e443ca593a8bcbc4ace4145b644d05df5':
|
2013-10-09 19:49:22 -07:00 |
|
Tadashi G. Takaoka
|
547b15e055
|
am 3a0ba7ad: am d64d8afb: am 953a0bfd: am f2b2b69c: am cda685f6: am 7ffb4225: am 1b6271fc: am 95fed887: am 35952d7b: am 2f6851d9: am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '3a0ba7ad710274193c16242163699c0768417c4e':
|
2013-10-09 19:49:20 -07:00 |
|
Satoshi Kataoka
|
375ff4ab54
|
am 68f8f838: am b75b70db: am 62833cdf: am 175c3083: am ee7c9e88: am 0788e947: am 6ffd1e66: am 143e628c: am 7f63d12e: am 6cf492e4: am 941b288c: am df2eae6e: Fix exact match profanity
* commit '68f8f83851618c123ce4fda460bd4e635e092b46':
|
2013-10-09 19:49:17 -07:00 |
|
Tadashi G. Takaoka
|
1da6063d69
|
am b5fb9fa2: am f2ea52e2: am 546d1339: am b16017d5: am 8b2a17e9: am 54b1c86d: am 3688ddd2: am 7a0c82b2: am f6cd82d7: am 03fe0cf4: am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
* commit 'b5fb9fa273d1f60ce35d6eab6468842b903ee9ed':
|
2013-10-09 19:49:15 -07:00 |
|
Jean Chalard
|
425b1efb25
|
am d333c0c8: am d5dca48b: am 3f717593: am 56f10d19: am b04d0337: am aac20e4b: am 31ddb205: am bfdb0fb1: am 457b6ae8: am a10c80fe: am 4aa48aed: am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit 'd333c0c8fbb0afd5a039de1d9d42ef61ca99bde9':
|
2013-10-09 19:49:12 -07:00 |
|
Baligh Uddin
|
82a6171af2
|
am a4ab746d: am aa4f95a5: am 5c518d61: am c8e34872: (-s ours) am f0136e37: (-s ours) am 5b1fe393: (-s ours) am 5ca69fe4: (-s ours) am 5d9f4081: (-s ours) am 00078f79: (-s ours) am 50925559: (-s ours) am d2ea99b7: am c9f49b88: (-s ours) am b4251873: (-s ours) am e5ae0b
* commit 'a4ab746d02a6f044acde4ab8d19e377248910249':
|
2013-10-09 19:49:09 -07:00 |
|
Baligh Uddin
|
e9d375143b
|
am b2f119ad: am abf5ceac: (-s ours) am caaf5673: (-s ours) am bfb9af84: (-s ours) am bb0a3ccb: (-s ours) am d33c8baf: (-s ours) am 949b2a42: (-s ours) am 7bde4523: (-s ours) am 39afe052: (-s ours) am 6242fca8: (-s ours) am 8daffca0: (-s ours) Merge "Import translation
* commit 'b2f119ada23585670e199419827571cb5097b038':
|
2013-10-09 19:49:03 -07:00 |
|
Ken Wakasa
|
43f3665698
|
am eff6bc9b: am 17712198: am b6c34066: am 3acf77cc: am b084305f: am 0c4f934a: am bd326eda: am 8aed26b4: am 4c526225: am 45fe5c34: am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit 'eff6bc9b0967cc6890cc07b286a79b8fe7ef5687':
|
2013-10-09 19:49:00 -07:00 |
|
Tadashi G. Takaoka
|
3d07e8ce1e
|
am 030cfe2b: am 67b3be7c: am d1b73078: am 89e30b73: am edf8a28f: am fb7a2163: am 16a3fb0e: am 53d9ed64: am cfb0c03c: am 24fc5ab6: am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit '030cfe2b84f0d1e73926a429f5957c219e9308c9':
|
2013-10-09 19:48:57 -07:00 |