aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0a204ea9: am 465b7d7c: am 14d356d1: am d5e72d74: am 24c5560e: am ↵Jean Chalard2013-10-030-0/+0
|\ | | | | | | | | | | beac5760: am ffcbb571: am 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '0a204ea925b5ccd3c2e9a00d9fb5cf24f16300b3':
| * am 465b7d7c: am 14d356d1: am d5e72d74: am 24c5560e: am beac5760: am ↵Jean Chalard2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | ffcbb571: am 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '465b7d7c3508e4eadae8a85389d1a06b565f953b':
| | * am 14d356d1: am d5e72d74: am 24c5560e: am beac5760: am ffcbb571: am ↵Jean Chalard2013-10-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '14d356d1cc0ef05681795419992da3caf3b8f0d3':
| | | * am d5e72d74: am 24c5560e: am beac5760: am ffcbb571: am 11aebd5a: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit 'd5e72d74fb0ff6fcef04eea2d809770935b5fbe1':
* | | | | am 99a0fa2f: am 6796473b: am 668dc1eb: am 2ddb9422: am 51be4eaf: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f9767aa: am 9a4b776d: am 4c8d527f: am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing po * commit '99a0fa2fd523d1cf58af58da3e3b7cd1ad8bc6a5':
| * | | | am 6796473b: am 668dc1eb: am 2ddb9422: am 51be4eaf: am 4f9767aa: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a4b776d: am 4c8d527f: am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '6796473b65771f15957817687794aeceb90c51a4':
| | * | | am 668dc1eb: am 2ddb9422: am 51be4eaf: am 4f9767aa: am 9a4b776d: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 4c8d527f: am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '668dc1eb3b953bac5390a55fc52dffed1ab57953':
| | | * | am 2ddb9422: am 51be4eaf: am 4f9767aa: am 9a4b776d: am 4c8d527f: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '2ddb9422fc597ce50f369a07feef84973ad735a1':
* | | | | | am a6738eed: am cdf0e0d9: am 2f3a1dc4: am 1e11b6fd: am e8d9afc5: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01ce6e7e: (-s ours) am 1b9de8c5: (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) * commit 'a6738eed25b2d5f7979fead10f6ac6a4a6c1b017':
| * | | | | am cdf0e0d9: am 2f3a1dc4: am 1e11b6fd: am e8d9afc5: am 01ce6e7e: (-s ours) ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1b9de8c5: (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: * commit 'cdf0e0d9d7c013dbb4b313449963a6a4e68043de':
| | * | | | am 2f3a1dc4: am 1e11b6fd: am e8d9afc5: am 01ce6e7e: (-s ours) am 1b9de8c5: ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: * commit '2f3a1dc44eaec846bc4788fa536d00fa1170b7be':
| | | * | | am 1e11b6fd: am e8d9afc5: am 01ce6e7e: (-s ours) am 1b9de8c5: (-s ours) am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: * commit '1e11b6fd8cc2b45c68cb23b469a3a35d26bd0695':
* | | | | | | am 01e53afc: am d69d9044: am a0a16b0c: am 5fa0e866: am 2a15c64f: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1b59b4e: (-s ours) am f1aae28e: (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) * commit '01e53afc463c6b0b384aa26935365619d158e8bb':
| * | | | | | am d69d9044: am a0a16b0c: am 5fa0e866: am 2a15c64f: am d1b59b4e: (-s ours) ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f1aae28e: (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: * commit 'd69d9044e976f3676715830c3d2a42803ba2b2eb':
| | * | | | | am a0a16b0c: am 5fa0e866: am 2a15c64f: am d1b59b4e: (-s ours) am f1aae28e: ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: * commit 'a0a16b0c0c97cb54e7edbd3b2a27eaa791d47361':
| | | * | | | am 5fa0e866: am 2a15c64f: am d1b59b4e: (-s ours) am f1aae28e: (-s ours) am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: * commit '5fa0e86674af9b34863d609ae0ce1db1570d849a':
* | | | | | | | am e3931b5e: am 34ee71e9: am 17398eb7: am 21d6a1eb: am c5b6fe56: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 747d95ef: am d804cb42: am 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits * commit 'e3931b5e8d6e880a2d52c9d35478ed5f24b48009':
| * | | | | | | am 34ee71e9: am 17398eb7: am 21d6a1eb: am c5b6fe56: am 747d95ef: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d804cb42: am 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently. * commit '34ee71e99cc80ffeda117fe96e763248aa706399':
| | * | | | | | am 17398eb7: am 21d6a1eb: am c5b6fe56: am 747d95ef: am d804cb42: am ↵Kurt Partridge2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '17398eb7acf47d7507d52877856e3f00625263b3':
| | | * | | | | am 21d6a1eb: am c5b6fe56: am 747d95ef: am d804cb42: am 033792b6: am ↵Kurt Partridge2013-10-030-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '21d6a1eb929b0d32f0997b9d38d8d15baddb9897':
* | | | | | | | | am f042c327: am 9da4cf0e: am 1c294e9b: am 0995977c: am 9b82e15d: am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dcd2956: am 6e6e87d5: (-s ours) am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56 * commit 'f042c327511f659f454b2e34ab50a81edadef4c6':
| * | | | | | | | am 9da4cf0e: am 1c294e9b: am 0995977c: am 9b82e15d: am 9dcd2956: am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e6e87d5: (-s ours) am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706 * commit '9da4cf0ee2207c121c8c6fad4fe437f79789bc04':
| | * | | | | | | am 1c294e9b: am 0995977c: am 9b82e15d: am 9dcd2956: am 6e6e87d5: (-s ours) ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed * commit '1c294e9b54783c53f387c74e6266ef0f9e35cab6':
| | | * | | | | | am 0995977c: am 9b82e15d: am 9dcd2956: am 6e6e87d5: (-s ours) am bcf54a1e: ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) * commit '0995977c10a2475ff9c4af9c2239b6d0622e642d':
* | | | | | | | | | am 6aea9a03: am 1e80b3eb: am 9b4ccd96: am 3455f2bc: am a0a2b9c3: am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34e2eb25: am 4adf7c44: (-s ours) am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e722 * commit '6aea9a03935b83bf66ee0ce683b49cc2ae879429':
| * | | | | | | | | am 1e80b3eb: am 9b4ccd96: am 3455f2bc: am a0a2b9c3: am 34e2eb25: am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4adf7c44: (-s ours) am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74 * commit '1e80b3eb911150d106f544d95d7381ca932b57cc':
| | * | | | | | | | am 9b4ccd96: am 3455f2bc: am a0a2b9c3: am 34e2eb25: am 4adf7c44: (-s ours) ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) * commit '9b4ccd96b72e8b064295fd941aea993bc8085412':
| | | * | | | | | | am 3455f2bc: am a0a2b9c3: am 34e2eb25: am 4adf7c44: (-s ours) am 87156ef4: ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import * commit '3455f2bc5ab30f5f47643317224b8395ea05a99a':
* | | | | | | | | | | am 37b1d71f: am 1e0083a8: am 94e38883: am 06917b2f: am 2e70142a: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1260923e: am 164e681f: am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder Resear * commit '37b1d71f6ef49767f280fd5f5e86043ebd72cc2b':
| * | | | | | | | | | am 1e0083a8: am 94e38883: am 06917b2f: am 2e70142a: am 1260923e: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 164e681f: am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call * commit '1e0083a89b1f92fa519ca6df11a8ee343169f391':
| | * | | | | | | | | am 94e38883: am 06917b2f: am 2e70142a: am 1260923e: am 164e681f: am ↵Kurt Partridge2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit '94e388830e5d0c112b704efccdd26a09e6ff98db':
| | | * | | | | | | | am 06917b2f: am 2e70142a: am 1260923e: am 164e681f: am c9b193c1: am ↵Kurt Partridge2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit '06917b2f057d02e3fc0a1cde6abe86be448bfb02':
* | | | | | | | | | | | am 19a7ef6d: am 04658027: am e547b53d: am 4b6c72a0: am 2acd9fcd: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44800b31: am a05f6c1c: am 2d03ab45: am c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4 * commit '19a7ef6d51d4b4ff4af27c5ac20d7220038272a0':
| * | | | | | | | | | | am 04658027: am e547b53d: am 4b6c72a0: am 2acd9fcd: am 44800b31: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a05f6c1c: am 2d03ab45: am c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactiva * commit '04658027bf55a3aeb918c7f76d9f7ab4857efe5a':
| | * | | | | | | | | | am e547b53d: am 4b6c72a0: am 2acd9fcd: am 44800b31: am a05f6c1c: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d03ab45: am c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware k * commit 'e547b53ddbb7e32d4ea4d87784240e85265b1b76':
| | | * | | | | | | | | am 4b6c72a0: am 2acd9fcd: am 44800b31: am a05f6c1c: am 2d03ab45: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handl * commit '4b6c72a0bbf2860e81e9edb751a89f8abadd853b':
* | | | | | | | | | | | | am 970cd020: am 0dad6d90: am 888f6ead: am 855aa95e: am eda828fc: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77dd85d9: am ea6db9ac: am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate ge * commit '970cd020b1f857ee7ee8f940ce3a6e6d1a3a0c5c':
| * | | | | | | | | | | | am 0dad6d90: am 888f6ead: am 855aa95e: am eda828fc: am 77dd85d9: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea6db9ac: am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview * commit '0dad6d9003a38fb2964a4a7a3ce2667ede232de2':
| | * | | | | | | | | | | am 888f6ead: am 855aa95e: am eda828fc: am 77dd85d9: am ea6db9ac: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '888f6eada2736408bf91a8cc5213c6e4db13abb5':
| | | * | | | | | | | | | am 855aa95e: am eda828fc: am 77dd85d9: am ea6db9ac: am 254cb1ff: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '855aa95e92c711cb364b01b6a412f511c62f0e68':
* | | | | | | | | | | | | | am 22e17809: am a1c80285: am cc34a551: am f067287e: am 9feb95cd: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 718b9f3d: am 053e4ac9: am e406c316: am 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy an * commit '22e1780903d4968470251e972b8a90c9610dc758':
| * | | | | | | | | | | | | am a1c80285: am cc34a551: am f067287e: am 9feb95cd: am 718b9f3d: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 053e4ac9: am e406c316: am 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to * commit 'a1c8028542828d41e5569738cb2f80e3d10c06c2':
| | * | | | | | | | | | | | am cc34a551: am f067287e: am 9feb95cd: am 718b9f3d: am 053e4ac9: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e406c316: am 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit 'cc34a55165dce5eccef56ba6318c2f299f99999d':
| | | * | | | | | | | | | | am f067287e: am 9feb95cd: am 718b9f3d: am 053e4ac9: am e406c316: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit 'f067287e93c704846e523bb1cb714b7ed6f75b84':
* | | | | | | | | | | | | | | am 5f35ef27: am 9875b776: am 9407a2c0: am f47c3325: am e1500eda: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc599f8a: am 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client * commit '5f35ef27261eb6e0815864130dd71100eba414f6':
| * | | | | | | | | | | | | | am 9875b776: am 9407a2c0: am f47c3325: am e1500eda: am bc599f8a: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itse * commit '9875b776120fe097892c474d087b9e170676aff6':
| | * | | | | | | | | | | | | am 9407a2c0: am f47c3325: am e1500eda: am bc599f8a: am 42b7bad5: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when * commit '9407a2c06748ac839a881b56ff3c051190ca3cbc':
| | | * | | | | | | | | | | | am f47c3325: am e1500eda: am bc599f8a: am 42b7bad5: am 114e9c56: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit 'f47c33253843c45f85dfdfa1b6f11f2b92ac860b':
* | | | | | | | | | | | | | | | am 26ae6f2a: am d8f0eb0d: am 842d3dc4: am 19bf4335: am 4ab974c1: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a034f847: am ef9ab1c6: am 00f46f03: am 174ddfd4: am 472f764f: am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty * commit '26ae6f2aac1309bca23b8d95d677b206e9774542':
| * | | | | | | | | | | | | | | am d8f0eb0d: am 842d3dc4: am 19bf4335: am 4ab974c1: am a034f847: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef9ab1c6: am 00f46f03: am 174ddfd4: am 472f764f: am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with sur * commit 'd8f0eb0ddf6ab459cc19b57d4aa9eb1fc19b3768':