Commit Graph

20793 Commits (8666930791d5c9de131c4e4745daa6c9d14ba54c)

Author SHA1 Message Date
Satoshi Kataoka 642d673ec9 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 0cc63149: am c1c3e
* commit '856f398afa4c4b712bd763e772af2a2c92280c14':
2013-10-03 16:34:40 -07:00
Tadashi G. Takaoka 5b904d1997 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 dbb90d08: am bd7b4
* commit 'f6b1bb1ab94dbe2ded37c08c99cee748632e9b86':
2013-10-03 16:34:35 -07:00
The Android Open Source Project 885b23d005 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: am c4176236: (
* commit 'ede353daac76484ff85d5f32941f52a19d6774a7':
2013-10-03 16:34:29 -07:00
Alan Viverette 27f40596b6 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 9ecac40d: am 4f11a
* commit '88ed711b1b9ab7e0251bdf53723d9581dd367099':
2013-10-03 16:34:26 -07:00
Jean Chalard c8c3040eb2 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 4ddfde7b: am a050
* commit 'a741504ba6714bdde64a01cb1bcde541e22e5722':
2013-10-03 16:34:19 -07:00
Jean Chalard d02bd16404 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 "Increase strin
* commit '3c686cf8775469a7311ceac1f411bb9057d0cfeb':
2013-10-03 16:34:15 -07:00
Baligh Uddin 07d8d49cca 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 108ee452: am f980
* commit '17db1468e05561b887e58f8169865a0b827ca2c5':
2013-10-03 16:34:03 -07:00
Baligh Uddin 20198fba8b 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 ours) am c128300
* commit '15b058b2cf4e3452ba007765094eab07be3c752b':
2013-10-03 16:33:55 -07:00
Baligh Uddin a8abf8488d 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 68889f1c: (-s ours)
* commit '580d6c87a43df6ad74f8a53c3754d27389afc5f4':
2013-10-03 16:33:51 -07:00
Satoshi Kataoka 2ceee80496 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 "Fix Possible N
* commit '516ebca744e413fe5a10213b35eeb97d0171576e':
2013-10-03 16:33:46 -07:00
Satoshi Kataoka 484baaa0a6 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 "Fix possible S
* commit '3c50d9b49fc24324dfa3f5eb44c778216f147298':
2013-10-03 16:33:40 -07:00
Kurt Partridge 528630b57c 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 "Close Research
* commit 'd850f97267e9fd9c02d5b49a16e5ba49fffd409b':
2013-10-03 16:33:37 -07:00
The Android Open Source Project be0bbc3906 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 62adeccd: am 577f
* commit '1fdce5fc2e46cefa8344f98467c4a89135a1a632':
2013-10-03 16:33:22 -07:00
The Android Open Source Project 0105e1deed 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 d2582473: (-s ours)
* commit 'a9d5458238474509da469676fe39a4a74cbaad9c':
2013-10-03 16:33:18 -07:00
Baligh Uddin 9c4151cac1 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 e7d91194: (-s ours)
* commit '081b2fd7aa57f7c99d3fe847d0199ecfbcde7021':
2013-10-03 16:33:15 -07:00
Baligh Uddin cf64d461d8 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: am 4b8494c4:
* commit '5ff55b7262a6932ac42ffa9bc2c63e6f99951a06':
2013-10-03 16:33:12 -07:00
Baligh Uddin 0e0ee0c469 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 128ab7e5: Imp
* commit 'bdfd52abb90521a6418de84c1742233ca30cd400':
2013-10-03 16:33:08 -07:00
Satoshi Kataoka 53ee8c1c26 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 'ffe66eaead8daac0ce4dfeddf8bcf5561602e5a3':
2013-10-03 16:33:05 -07:00
Jean-Baptiste Queru 05972fff36 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 30667266: (-s ours)
* commit '90ee9d88cac83f37ff200c6738e571562f4bc360':
2013-10-03 16:33:02 -07:00
Kurt Partridge 747139f686 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 'abfc15c315b601fb374149765610c91388376e7e':
2013-10-03 16:32:58 -07:00
Tom Ouyang e1d1771f38 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 'f8b9c89546a3d5d015a53699b150adbfcefbfa52':
2013-10-03 16:32:54 -07:00
Tom Ouyang 3310a49565 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 '3512e13dbca5c29d3b7d6e5d6f0bd38c9d7c8080':
2013-10-03 16:32:51 -07:00
Kurt Partridge dd524490ff 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 'd557dbdc173c71ea19a10de23190364689b72349':
2013-10-03 16:32:42 -07:00
Baligh Uddin e4298eee4a 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 translations
* commit '493ad96c0a8af7ba25c47803dd57392d7d9737e7':
2013-10-03 16:32:38 -07:00
Baligh Uddin db9cb81a08 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. DO NOT MERG
* commit '4a832423fc025ccf1d6b5412e7a8caaa7de0315a':
2013-10-03 16:32:34 -07:00
Jean Chalard 17f1fec6e7 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 'a9711b10755e93337176fec90cd65c1d1f7fe11f':
2013-10-03 16:32:30 -07:00
Tadashi G. Takaoka 376881ea75 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 '8aac7054c7d0bcaa8fa2a454685d567c2e3359ec':
2013-10-03 16:32:26 -07:00
Tadashi G. Takaoka 53d13481db 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 'f2332757b22cc638a5f01e23d1a38176d3728e7a':
2013-10-03 16:32:23 -07:00
Tadashi G. Takaoka 6f018aff55 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 '4f808406cb075ad46a3a0e160b922cd4f6068be1':
2013-10-03 16:32:20 -07:00
Jean Chalard 96fe834575 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 '00460bbfcbf0df63099eecf383f2e17301a56f8e':
2013-10-03 16:32:16 -07:00
Jean Chalard ace4d9b262 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 '594c18cb946b9aa2f4c9b668d813a8dcdc6172b5':
2013-10-03 16:32:12 -07:00
Tadashi G. Takaoka 5c4a7b71e1 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 '54ed0cea0f0d3e9a1b1c4258992cc0aded86cc87':
2013-10-03 16:32:09 -07:00
Tadashi G. Takaoka 4868dea0e4 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 '23170426c9b3316a17ad82f7f7a489278d232386':
2013-10-03 16:32:06 -07:00
Keisuke Kuroynagi 21ba9371ab 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 'c83b9a2a3d52a92f930088ae06acfd7b1417ebac':
2013-10-03 16:32:00 -07:00
Tadashi G. Takaoka cfc4c03930 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 '24002e008461db8fa36961b3f5fb49658fdb4e2a':
2013-10-03 16:31:56 -07:00
Tadashi G. Takaoka 79711cb91d 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 'a9da8260a29af2e1d227202594f97496240094e7':
2013-10-03 16:31:53 -07:00
Tom Ouyang 56ad6dcee1 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 'ea3cabaa2008345862cfd52c0c120f9939c5c661':
2013-10-03 16:31:49 -07:00
Baligh Uddin 66f1fccd5b 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 "Import trans
* commit '7f9ce3da2938ba38f8bae50319211eb0344cd69a':
2013-10-03 16:31:46 -07:00
Baligh Uddin 780a275d55 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 "Import translat
* commit '9441e35c152a87522b44108c081c98e83807458e':
2013-10-03 16:31:42 -07:00
Kurt Partridge 0a275faee6 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 'a41a0e2d036493e82a37eb4e99bb59a07e987556':
2013-10-03 16:31:38 -07:00
Kurt Partridge ddc5011700 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 '2c4b1e308598df0d46fc262d05ea72dc6c1efa02':
2013-10-03 16:31:35 -07:00
Kurt Partridge ac0057ccaf 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 '18c17e76bdab63572a6ecbfe114cfa477ca44029':
2013-10-03 16:31:32 -07:00
Kurt Partridge 749c2b0a71 am 33f2954c: am 6bb76fc9: am 9bc70bf6: am 9afca8be: am 38633094: am aa09dc17: am b3d0ada6: am 453b371d: am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
* commit '33f2954cfdbdde845f4ee4cc92818cd687f6e918':
2013-10-03 16:31:25 -07:00
Kurt Partridge 5f0b1d7899 am e9632b6c: am edbed310: am 06f8fc4b: am 1839c07b: am 518d0b24: am db17d68c: am 5ce4b09f: am 10270196: am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
* commit 'e9632b6c191086c6449a9c5bdffe135a99f713ba':
2013-10-03 16:31:22 -07:00
Kurt Partridge 9fcb10488e am c46d6a5f: am 9278d1fa: am 5b75b4c0: am 3395d08d: am c56a9ded: am 9ed2d091: am 35f2616d: am 86b2c57c: am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'c46d6a5fb108154a60617a727d8e1592051eabe1':
2013-10-03 16:31:15 -07:00
Kurt Partridge b8604121ed am 1298bd16: am 89dd01d5: am 2904c0d6: am 5bf679ee: am 484ad03b: am bdfa2db7: am 3d5fc5fb: am 79cd791b: am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"
* commit '1298bd169642b978bc56bba4f1a4c9528f051ed8':
2013-10-03 16:31:06 -07:00
Kurt Partridge 5d84736b20 am 1df2e4e0: am ce1480b0: am 162c665f: am ab4ceeff: am aa4a4067: am e1610fe4: am 38774801: am 22c706aa: am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"
* commit '1df2e4e09cb62b76c2295e4fd8240ceee260d94c':
2013-10-03 16:31:03 -07:00
Kurt Partridge e674cb2499 am a3d2bda5: am a40f0e8a: am bb59b627: am e9f95633: am 6e351dc6: am 47dd23fb: am 7f0126ff: am 4a885f25: am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"
* commit 'a3d2bda58261a49e925fe75fb1ebc5a64026137e':
2013-10-03 16:30:59 -07:00
Kurt Partridge d0aef69929 am b7ccc373: am 74142730: am a285bd64: am 5d129e0b: am 17690c6e: am a2682fdd: am 3459400f: am 80a6848d: am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"
* commit 'b7ccc3732aab3d9e34199ebe431c148efec6bd39':
2013-10-03 16:30:56 -07:00
Kurt Partridge b0e3e431b2 am fd7db644: am 605f0d56: am 2ddc0e0f: am 6dd374d6: am da617a8c: am 13659dfe: am f64f23ea: am 21a2cfca: am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"
* commit 'fd7db644a4c93f0eba5725f4194dbfbc5092d84f':
2013-10-03 16:30:52 -07:00