Commit Graph

24048 Commits (e0968a12b9a6b776dbcd30bda02cdae4c36e009b)

Author SHA1 Message Date
Ken Wakasa 9257c04967 Merge "Revert "Add Swiss French and German keyboard layouts."" 2013-10-10 02:06:12 +00:00
Ken Wakasa 56402cf10a Revert "Add Swiss French and German keyboard layouts."
This reverts commit 220ce8f269.

Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.

Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
2013-10-10 02:05:50 +00:00
Alan Viverette dbbf84bac8 am 5a9ba46f: am 09674fc5: am d9f69bc4: am a53123b4: am 3462e3f8: am a02c3d8b: am 12f609e4: am 3dc70862: am 28a831de: am c795a288: am 69ef660f: am 3de1ae1a: am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807
* commit '5a9ba46f384051299a0fb4921ae78544bcba7129':
2013-10-09 18:00:20 -07:00
Satoshi Kataoka 3062a78f91 am af657bb3: am 91464af1: am 285cdd65: am 392aab8d: am bc8897d8: am 5005bcfb: am 291c9f40: am 363394c9: am 04708a32: am d1935d05: am d0642a34: am 775ef9bc: am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1
* commit 'af657bb3350f71197d680df8a0fe1abb68bb8574':
2013-10-09 18:00:18 -07:00
Tadashi G. Takaoka eca8a3947a am f758f977: am 074aeed2: am b121003a: am 073e2a60: am 7632947c: am 02ce1826: am c82a6144: am 4a12a2b6: am bfb18559: am 37232a10: am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992f
* commit 'f758f9777215dd20adee1d9a2a65e8628bc72468':
2013-10-09 18:00:15 -07:00
Tadashi G. Takaoka 5a6494829d am a5f62e15: am 7be8ad8b: am d859338a: am bf255ffc: am 7d3abef1: am 71bf7c0f: am c13ad1dc: am 05e54e59: am 9faf1961: am c1e417dd: am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679
* commit 'a5f62e152491575af67f7fd65760c92058574d39':
2013-10-09 18:00:12 -07:00
Satoshi Kataoka 6ffad8ed43 am d28a0f44: am cf21001c: am 72a84117: am 935e291e: am 952656e6: am 50d795d9: am 6319b0fe: am e0e7b78f: am eecbcea7: am 4bb35fea: am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb50
* commit 'd28a0f44461dc0898aec53e91230b33688723069':
2013-10-09 18:00:09 -07:00
Baligh Uddin 1d5079c90d am c0bb381f: am c51a0f67: am c82913a7: am d1fc691c: am 94e383bb: am 276547da: am 0bd99dad: am dbff15a9: am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d
* commit 'c0bb381fd1ee92696186e4f56e02aab804cfd38e':
2013-10-09 18:00:06 -07:00
Satoshi Kataoka c618b2b492 am 642d673e: am 856f398a: am 9c03682c: am 4412ab10: am ce982f9c: am 99b03df6: am 75939dc1: am 32d5b4e3: am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63
* commit '642d673ec9637dd2d22d23840228dd83fcc05c16':
2013-10-09 18:00:03 -07:00
Tadashi G. Takaoka b1ecf6d8c4 am 5b904d19: am f6b1bb1a: am b49683c3: am 8427fd62: am 524882ce: am ed4dc25a: am b9b47104: am e9716016: am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90
* commit '5b904d1997de1e7822f9e350e28b510e7f85e078':
2013-10-09 18:00:01 -07:00
The Android Open Source Project c57f2a374f am 885b23d0: am ede353da: am 96e3bdb8: am 3e8fbbee: am 3c70e928: am 85b8dc48: am 9faf3e64: am 461a0480: am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: a
* commit '885b23d00548088ebfd5d5e89e4cc7ccd5b8ace7':
2013-10-09 17:59:58 -07:00
Alan Viverette 5aaf813026 am 27f40596: am 88ed711b: am 2e2feec5: am 8b84296a: am 55cefbcc: am 791e3780: am 7ba85ad2: am 74f99743: am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac
* commit '27f40596b663f9f733591552341121eed793e19f':
2013-10-09 17:59:55 -07:00
Jean Chalard b6d21841cc am c8c3040e: am a741504b: am 8cab4b32: am 0520a0fc: am 00ef2f30: am 1369200c: am baa4a50b: am 97b579d5: am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddf
* commit 'c8c3040eb239e23670131b08be74741bde3fb0cc':
2013-10-09 17:59:52 -07:00
Jean Chalard 74146e23e8 am d02bd164: am 3c686cf8: am 685b075b: am c84db8d1: am ea465c05: am 24601d1e: am b12b3b07: am 66833def: am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "I
* commit 'd02bd1640448b06873db931cf423c0f19dcb2851':
2013-10-09 17:59:49 -07:00
Baligh Uddin 257ff1d014 am 07d8d49c: am 17db1468: am 60d58582: am d9f69ba3: am 26b6ed18: am 08413e8f: am 02b8fc7b: am 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108e
* commit '07d8d49ccacb5fd763b3ce8d94b3b5dc8537cdb0':
2013-10-09 17:59:46 -07:00
Baligh Uddin e7790ef106 am 20198fba: am 15b058b2: am b54a9e60: am 97b6fda7: am 3cd58276: am e66c1e85: am e553f0e9: am 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s our
* commit '20198fba8b88267c8f164716b59676e3e6df347b':
2013-10-09 17:59:44 -07:00
Baligh Uddin 58c2db2ac2 am a8abf848: am 580d6c87: am 2d8c4674: am 7eca3bd8: am 637ae0fc: am c3ed8ac5: am 582bbf20: (-s ours) am 39177323: (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1
* commit 'a8abf8488d7b6c306de472837c5109c505663819':
2013-10-09 17:59:42 -07:00
Satoshi Kataoka fa48ae8e84 am 2ceee804: am 516ebca7: am 224892d8: am f97bffc5: am 949cbdc3: am 8f640acc: am 207ede4f: am 8af0cc2e: am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "F
* commit '2ceee80496b4a061befecd29f6d2a7b0eb703352':
2013-10-09 17:59:39 -07:00
Satoshi Kataoka 9927535a83 am 484baaa0: am 3c50d9b4: am 60317428: am 9b5ffeed: am b4fb8291: am 6581aad7: am d0776552: am 795895e1: am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "F
* commit '484baaa0a6a38b39339ba617282df3fcb64b79a4':
2013-10-09 17:59:36 -07:00
Kurt Partridge 54ebc97c6f am 528630b5: am d850f972: am 7bac0700: am c1576be9: am d2b1da1c: am a1c6ad87: am 1e5d5eac: am 4d4cb019: am c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "C
* commit '528630b57c2612548a79a4d138dd58fb3ddf6f01':
2013-10-09 17:59:33 -07:00
The Android Open Source Project a5f8a2fc5f am be0bbc39: am 1fdce5fc: am 58a6b71e: am 3f81b236: am bbf7e854: am 1b0bfc25: am 83827f33: am 258784da: am 37f22676: (-s ours) am b241b243: am 740243cb: (-s ours) am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62ad
* commit 'be0bbc39063a7de338276b9d22dc17d0be90e3be':
2013-10-09 17:59:30 -07:00
The Android Open Source Project 5a08ee9d1b am 0105e1de: am a9d54582: am 05f38a8b: am fc2adc8b: am 8a37c1fb: am 72437810: am 6d5d6c0a: (-s ours) am 10f50a1b: (-s ours) am 3f031112: (-s ours) am 3675b5bb: am 1996320a: (-s ours) am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d258247
* commit '0105e1deedea64d225044563cbfc01eb88afeaaa':
2013-10-09 17:59:28 -07:00
Baligh Uddin 456f03cb07 am 9c4151ca: am 081b2fd7: am 4db24fdd: am d08c8315: am c7818cfc: am 0fc3659a: am d1af11ed: (-s ours) am 08f53d3c: (-s ours) am d28727d9: (-s ours) am 480ebe79: am 403354ba: (-s ours) am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d9119
* commit '9c4151cac15c379c5a3e4510fd172bbe0c4c7877':
2013-10-09 17:59:26 -07:00
Baligh Uddin af9f31f4b0 am cf64d461: am 5ff55b72: am e6b8361a: am 1c6e1a62: am 2b4d0089: am 033d5a13: (-s ours) am ea8146e0: (-s ours) am 7c692a83: (-s ours) am d31b88ab: (-s ours) am 7c9a29d5: am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce:
* commit 'cf64d461d8feffd65e6d95d83ccdc28bb5d5603f':
2013-10-09 17:59:22 -07:00
Baligh Uddin 5963d1a392 am 0e0ee0c4: am bdfd52ab: am 6cd98b80: am ae5a5b4a: am 720c8b5e: (-s ours) am b242d5ac: (-s ours) am 07afd456: (-s ours) am 01f2d0d3: (-s ours) am 097dee9d: (-s ours) am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am
* commit '0e0ee0c469c479d0b7bc85d6977fca82dbee2bc3':
2013-10-09 17:59:19 -07:00
Satoshi Kataoka e08e888a19 am 53ee8c1c: am ffe66eae: am 82ea6bd6: am d11b3b0d: am 3d8bceb7: am 51e78c31: am 7b711133: am 5b116569: am 659774af: am 24c86a66: am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '53ee8c1c26785474e4149954edc0e96f7781d464':
2013-10-09 17:59:16 -07:00
Jean-Baptiste Queru b493b42d0d am 05972fff: am 90ee9d88: am cb2685fa: am 80623ab7: am a8216894: am f02923c5: am 47145aab: (-s ours) am 9e6c86fb: (-s ours) am d535416e: (-s ours) am 68dcdeed: am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 3066726
* commit '05972fff362e4fed987a1f20cf2810612d956f3b':
2013-10-09 17:59:14 -07:00
Kurt Partridge 24546db696 am 747139f6: am abfc15c3: am 0ced111c: am 643a9f2a: am aab6efb2: am 8808a1fd: am 59419126: am f775fa34: am e64ec6e1: am fb4da969: am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '747139f6862eac4ed14f1d9112e676a042cb0573':
2013-10-09 17:59:11 -07:00
Tom Ouyang cdc460e2f9 am e1d1771f: am f8b9c895: am 88a25b5a: am 38304f84: am 502c1a99: am d8b1a529: am 72470f4d: am 454ac2b5: am 607c566c: am bcefab0c: am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'e1d1771f384e457ee3d5e1281d61bdaa2287f458':
2013-10-09 17:59:08 -07:00
Tom Ouyang b1fd9f21ba am 3310a495: am 3512e13d: am cfeba997: am 10f1c682: am c050fd36: am ff4fa290: am bdec4e5a: am 616fabde: am 94e209c5: am 0fe18452: am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '3310a495656fa2f9aa10292594e94f822ea0091c':
2013-10-09 17:59:05 -07:00
Kurt Partridge f319fd28e3 am dd524490: am d557dbdc: am 640ee854: am bbebf668: am 19ab3127: am 4e70a387: am 1b55e9de: am 19749e3d: am 07cc9c07: am d40d2f35: am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit 'dd524490ff0a7d90458639939380a915e4808159':
2013-10-09 17:59:02 -07:00
Baligh Uddin 8bc5daf2e6 am e4298eee: am 493ad96c: am a67d48fa: am bb49aac1: (-s ours) am f5f75e57: (-s ours) am 5ff9749f: (-s ours) am 829605ac: (-s ours) am 17595bde: (-s ours) am 98fa49d5: (-s ours) am 265eed2b: am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import
* commit 'e4298eee4a25dc473907f6a83ae84f2e963762c4':
2013-10-09 17:58:59 -07:00
Baligh Uddin c8ad3f51ff am db9cb81a: am 4a832423: am 0ade0e6a: (-s ours) am 327de990: (-s ours) am 03c8daf6: (-s ours) am 20ce3394: (-s ours) am 9f6c43e9: (-s ours) am 836db9be: (-s ours) am 879d9c28: (-s ours) am 93e873cf: am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations
* commit 'db9cb81a0884172c08c03540ab37dc685155e7f7':
2013-10-09 17:58:57 -07:00
Jean Chalard e386327038 am 17f1fec6: am a9711b10: am 62889708: am 68f7f50a: am d72265fc: am 6fb19dee: am 880ac788: am 6ecb9825: am cbecd375: am 56e03dd3: am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '17f1fec6e7b7c089e992de0425ca5dedcf5663e5':
2013-10-09 17:58:55 -07:00
Tadashi G. Takaoka 33dec62d43 am 376881ea: am 8aac7054: am 2163d085: am 0f1fc9f9: am 2f03f385: am e1e729b6: am 39b25828: am 4bc899e6: am 8d38f574: am 7d4f0961: am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit '376881ea75ae8fc9e85ddda859985dff2b419315':
2013-10-09 17:58:53 -07:00
Tadashi G. Takaoka 98f8966014 am 53d13481: am f2332757: am e5583801: am fa000043: am 15d6cd0e: am 76ab7fac: am 91c404ba: am 4d6bb7dc: am 6fe0a646: am 38af721f: am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '53d13481db82a7f83ccb090ab6447b00173039ae':
2013-10-09 17:58:45 -07:00
Tadashi G. Takaoka e812a8fa50 am 6f018aff: am 4f808406: am 3a321541: am 917c4e67: am fd15d725: am c279efed: am 45b2d7bb: am 3f968e9b: am 869aebcc: am 45a1fbd4: am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '6f018aff55f029a80f1dc881513038543fc2d21e':
2013-10-09 17:58:43 -07:00
Jean Chalard a9de05faa8 am 96fe8345: am 00460bbf: am ab0a0a00: am da897648: am 3e0195c6: am 59ec247a: am 419cf734: am e81f1c43: am 4168d0b5: am 1792b892: am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '96fe8345752a4c344cac9421c51237db67717c39':
2013-10-09 17:58:41 -07:00
Jean Chalard da96dd4b7f am ace4d9b2: am 594c18cb: am 3a0b7c2d: am 58aba661: am 96c05662: am 1b912384: am 3955d9fa: am 98f1d046: am e40d883f: am 0cfbc7c6: am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit 'ace4d9b262ddcb27bdcd37b3747760660e089dec':
2013-10-09 17:58:38 -07:00
Tadashi G. Takaoka 088367e6de am 5c4a7b71: am 54ed0cea: am 7659b984: am cde9aa84: am 48ef0965: am 6c9533d4: am e53d0edd: am a2d064a1: am 6de62a6b: am b3f31ea6: am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit '5c4a7b71e1af2442ec032a67be29474a23471072':
2013-10-09 17:58:36 -07:00
Tadashi G. Takaoka 40c4dde31b am 4868dea0: am 23170426: am 043388cb: am 5d2549ba: am 3727bbd4: am 5ab9d963: am b4772213: am 09f28910: am 85ee1317: am 367fe0c3: am f8a1317f: am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit '4868dea0e4a3a897ae3d897448e565d98e453141':
2013-10-09 17:58:32 -07:00
Keisuke Kuroynagi 70774b7a04 am 21ba9371: am c83b9a2a: am bd89311c: am 459fa6f5: am 9348576c: am 3d0a06e6: am 5816e1d9: am 6415e676: am f610ea30: am e3997340: am cde21724: am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit '21ba9371abf91418075acbb348f16e0a90194af4':
2013-10-09 17:58:29 -07:00
Tadashi G. Takaoka f1d552efa4 am cfc4c039: am 24002e00: am 158e2937: am e9c457c9: am 01584c88: am da632d9c: am dbe34353: am 9b20d045: am ea501891: am eea5453c: am 86726e21: am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit 'cfc4c03930ea4621ce49e5858b8fc9dce3246bdb':
2013-10-09 17:58:26 -07:00
Tadashi G. Takaoka 8ffc7e5a93 am 79711cb9: am a9da8260: am c19d7fa6: am 0d9f6429: am 8156d363: am 33c6e923: am 2ea83477: am a5eea64d: am c98d4370: am 336bfb2f: am a51ddebb: am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit '79711cb91d88c2fdfaad8dfb19734868c939ba96':
2013-10-09 17:58:23 -07:00
Tom Ouyang 2b83f118cf am 56ad6dce: am ea3cabaa: am 731560a9: am be8acf9f: am 76834814: am f1e4f622: am 305d6cd2: am dda4915b: am 9de571ff: am 1711cee0: am 20d54cab: am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '56ad6dcee1e051238f950ac93baafc081401b77a':
2013-10-09 17:58:20 -07:00
Baligh Uddin 9b1c63d9b1 am 66f1fccd: am 7f9ce3da: am 1679f35e: am 8dc708ea: (-s ours) am 124a4a88: (-s ours) am 0eca14b3: (-s ours) am df18e529: (-s ours) am 7f6e0817: (-s ours) am 680b09d3: (-s ours) am f96989dd: am fe4c83c6: (-s ours) am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge
* commit '66f1fccd5bdca569764bc5effac124ffa699b14b':
2013-10-09 17:58:17 -07:00
Baligh Uddin 7b5f4e9eb7 am 780a275d: am 9441e35c: am c007ed34: (-s ours) am c549a905: (-s ours) am b0db40b8: (-s ours) am 51c0364f: (-s ours) am 28443cc4: (-s ours) am bffc5b05: (-s ours) am 29faddc4: (-s ours) am 0063ed45: am 79dcc4f0: (-s ours) am 2eede9f4: am 13811400: (-s ours) Merge "Im
* commit '780a275d550161e3e774501b08a864c1f5b9644f':
2013-10-09 17:58:14 -07:00
Kurt Partridge 11828f20f5 am 0a275fae: am a41a0e2d: am 4911e56a: am ada77b85: am ab39c85d: am 53dc9bce: am 62896e62: am 5dda13c0: am cb121fa8: am 24ba5149: am 436008fe: am d3497938: am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
* commit '0a275faee64e48027a81d4112b02449efb789d37':
2013-10-09 17:58:11 -07:00
Kurt Partridge d5561d57e7 am ddc50117: am 2c4b1e30: am 69b67ee9: am 77dd7884: am 0fb40dd0: am 8f30a74d: am 923d8ba4: am da086b24: am b1767bc4: am 40070707: am 7a172175: Merge "Fix user recording dialog"
* commit 'ddc5011700bb421b07401ba21b14ffe437092e1d':
2013-10-09 17:58:08 -07:00
Kurt Partridge acf7156353 am ac0057cc: am 18c17e76: am 81a64a10: am 98b11fa0: am 2d2a508f: am 470632b9: am 891152fd: am 2ffa7aef: am 5abe65f1: am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
* commit 'ac0057ccaf04df98a1e9b0ffe5f8c8950e6fb673':
2013-10-09 17:58:05 -07:00