aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am ↵Jean Chalard2013-04-170-0/+0
|\ | | | | | | | | | | 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '445d1115a00134846e51a38124d8679ad5c4e91b':
| * am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am ↵Jean Chalard2013-04-170-0/+0
| |\ | | | | | | | | | | | | | | | c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '7aa9277fd1d1919c5107f4c2856024a5a0da7c48':
| | * am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am ↵Jean Chalard2013-04-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit 'f6de7890ca419b79e910936008c25e2c0e4165dc':
* | | | am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit 'f9d5d10166d4e152e273196666e789f989112fdc':
| * | | am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '75b099f46d674f92328a39df3208728f9c391e09':
| | * | am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '23408ee60381e0f643f793125e71ae8c9d6607ad':
* | | | | am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit 'ce2a5f93aed2862f4397871d317d31baeac57f82':
| * | | | am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit '44590a161fd15dcd8879c8f9eada15eee2234b50':
| | * | | am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit '9d071843a453609b6c3881314dc2398f5ce9f86e':
* | | | | | am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit '01a862fba392db93985d7c644ba4728047b7ec2d':
| * | | | | am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit 'fd59acceff4deec5000dde5af431486e487d8a7c':
| | * | | | am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit '5a6b0787befbdbf4cfe777571b6d458102d0b877':
* | | | | | | am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am ↵Kurt Partridge2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '0f8c86c8ea9a81f0f4dd2fcf0c9abc9e1568125f':
| * | | | | | am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am ↵Kurt Partridge2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit 'a3837fd1a0a01d34a7e6ef73e51c79d91e143c7a':
| | * | | | | am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am ↵Kurt Partridge2013-04-100-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '4c74aaa09a093145c82b0264ae44ac11a0d5e78d':
* | | | | | | | am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '08f0697bc37d6ba06e3cc20c0e6e58f24a638f79':
| * | | | | | | am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6a7f4639759864689a155fcc567a5b21b6993cb2':
| | * | | | | | am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4a41a48fdb09077666859c9eab5320b49bbf7f11':
* | | | | | | | | am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit 'fbc9145961fe3be8732ae7dc04de17b201c1029d':
| * | | | | | | | am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '6ff63273e748484684ecae9c757615b68c8c6f49':
| | * | | | | | | am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '166b3f98d8c608170dee0b06bff0a2a3f1d32984':
* | | | | | | | | | am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ↵Kurt Partridge2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit '3a63e4e3b8175faeca1f8135a6bdf6e7642b96cb':
| * | | | | | | | | am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am ↵Kurt Partridge2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit '3fcaa3e8b4920dca0560e122a8a309087d02b26c':
| | * | | | | | | | am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am ↵Kurt Partridge2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit '1dc4a24f96912ee93409ffb418aa2b3bad3f5525':
* | | | | | | | | | | am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit '56e931de8055a0cd181bc16b51a605a3da06ead6':
| * | | | | | | | | | am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'feb16b6d4f37156d7a42589c210a2c6759349935':
| | * | | | | | | | | am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'b8a3454d1a9bd8297c2d4204b9a730702f5e5f9a':
* | | | | | | | | | | | am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '85fca857af9987993c82c76fb63aa07935c291cc':
| * | | | | | | | | | | am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '300d3bdee5ab6c3804e0c47ba0665a2d2140c56f':
| | * | | | | | | | | | am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit 'ab99e6139b699ec05842ca4f0ec53471a39e4186':
* | | | | | | | | | | | | am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit 'eeb386390ac5282d2212128aa5bec4a5c1a98092':
| * | | | | | | | | | | | am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit '656900003c92a370e3ac2e32b84631c1906d7d31':
| | * | | | | | | | | | | am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit '7d0d728ceb157afc8ff7ed2dbbcd65f6f5d58491':
* | | | | | | | | | | | | | am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit 'e29ffdb6c6344e7dd13936e22b8858c84b3802c4':
| * | | | | | | | | | | | | am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit 'c14fdded82fb293bd6d5a7b5487e4c6b0c8625dd':
| | * | | | | | | | | | | | am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit '714b0044f12e976a10a7d7fe1dcd7498177fc131':
* | | | | | | | | | | | | | | am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit '267e61790a6d1f41ead37efd6a4045f48227ff8b':
| * | | | | | | | | | | | | | am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit 'c26022cf59801de74e19fda38a7aff76f3039ad4':
| | * | | | | | | | | | | | | am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit 'd901066bf6e0c977fbe9a20dd10bb1954744d4c6':
* | | | | | | | | | | | | | | | am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit '371369d9f12b2ad47e328b0ec3e9268c64d68dd0':
| * | | | | | | | | | | | | | | am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'd196cb6400c074c7c03416b62c2428986c3a74e2':
| | * | | | | | | | | | | | | | am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit '8c485086f54bd70b799aea158e9db1871762d198':
* | | | | | | | | | | | | | | | | am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: ↵The Android Open Source Project2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e2cc803c4674b5efe49a19c82ca1f1fc9a131990':
| * | | | | | | | | | | | | | | | am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: ↵The Android Open Source Project2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a0b2dc74fa521cf584536b72e390f2aadb48d42b':
| | * | | | | | | | | | | | | | | am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am ↵The Android Open Source Project2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'aeb9680522c351e1f5ec1b7004953168a14805e0':
* | | | | | | | | | | | | | | | | | am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit '1417566219204f75eff13d3cd69ff3513f253971':
| * | | | | | | | | | | | | | | | | am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit 'b949db38568d02be216a9986ed0992ae57f0c13b':
| | * | | | | | | | | | | | | | | | am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70747ad6: am 97a3ce02: Merge "Refactor" * commit '51c0380fb639888cdc3562a939083c34ee8eeaef':
* | | | | | | | | | | | | | | | | | | am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit '34c0bef6759e22f0f9ac8aeadb9cd03c2b664c7f':
| * | | | | | | | | | | | | | | | | | am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit '9a181179b2c8ec8ee4b0468158cb565af8ceda8e':