aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am ↵Jean Chalard2013-05-150-0/+0
|\ | | | | | | | | | | 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '05a2f21edfe84ed59488aa9981602f52639f9655':
| * am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am ↵Jean Chalard2013-04-170-0/+0
| |\ | | | | | | | | | | | | | | | b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '46c38c6eab28dd3eefe9fed13dcaba2ce859a793':
| | * 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 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '148e15a93fa586a5a94ffcbaca43aefa27c2a38d':
| * | | am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit 'ab3280f0e44194e3fd460f87e2cd43bbfd77b406':
| | * | 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 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit '06d8d5fc802c54d78603f16dc958d680d5dce949':
| * | | | am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit '17e964b18c7d4848ba04b797c42a4aeee41b0a69':
| | * | | 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 a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit 'a2ccaa57fc0474b5393394ff9e26762a3f089bab':
| * | | | | am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit 'bd531725f55fb1d137c3fc984a68ce34125ec92c':
| | * | | | 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 a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am ↵Kurt Partridge2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit 'a24564b8f76c9aa3a384d2446d1e25ecfedec268':
| * | | | | | am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am ↵Kurt Partridge2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '4376a55e043fa2e815cf6363525fd15eeed99b57':
| | * | | | | 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 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7d5a1369c4b79ac62efee1168b9379da9116ae7e':
| * | | | | | | am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '761c188aa41f7d42c440481e6082ae06d4f5b476':
| | * | | | | | 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 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '214d5b2cccffd713f12e49c698e67a9319eef44f':
| * | | | | | | | am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '6f4025d64cc36dfe7d94ec406f740f08c4b9d3df':
| | * | | | | | | 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 fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am ↵Kurt Partridge2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit 'fdf1a05a57d70be081161bdacaced29866f2ce1b':
| * | | | | | | | | am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am ↵Kurt Partridge2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" * commit 'c0486a58efad1a78d399c8c1f36592e69e692a40':
| | * | | | | | | | 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 c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'c633b61ee00b0298f6f0cc1445317891d5760b89':
| * | | | | | | | | | am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. * commit 'dbb031c74aa1104b9e6267afddf58271bee35a15':
| | * | | | | | | | | 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 d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit 'd13a605cd91f15dc126d57401ebae967ac1ddeb5':
| * | | | | | | | | | | am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" * commit '59e17512cf9246cc2bce03e92ad90f584e712b5a':
| | * | | | | | | | | | 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 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit '85cb23c4627987129f7a40db6b1b08fa9a4ade8b':
| * | | | | | | | | | | | am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP" * commit 'a08620f13f2aeec95861c4af9c9553ada6c32d47':
| | * | | | | | | | | | | 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 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit '0eb45d7f370a8fe07dc7c407c5977e7501b1b0cc':
| * | | | | | | | | | | | | am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" * commit '484e9144775a9cf81bd678974956aaaabad16d5d':
| | * | | | | | | | | | | | 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 174ddfd4: am 472f764f: am 267e6179: am c26022cf: am d901066b: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit '174ddfd47934cd6497c0bcf9dc65c3fb41744a06':
| * | | | | | | | | | | | | | am 472f764f: am 267e6179: am c26022cf: am d901066b: am f921a587: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." * commit '472f764f5740ebb785d25f19842b002f23c346c5':
| | * | | | | | | | | | | | | 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 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit '78ed62326a8326dac53aa40df1f7b6353f4f9f63':
| * | | | | | | | | | | | | | | am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'a59d936c44ccfc1882cd653acd80d168173e89aa':
| | * | | | | | | | | | | | | | 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 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: ↵The Android Open Source Project2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am cfe49191: am 38a9f856: 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 '7c4dff90a216190762e6e1a05b884b737533ad94':
| * | | | | | | | | | | | | | | | am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am ↵The Android Open Source Project2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfe49191: am 38a9f856: 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 '892fcbfb8986b0ccef828dbc2f01d9ade4dfdf48':
| | * | | | | | | | | | | | | | | 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 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit '3d12edabf5059345b57e60c4de66e8de0dbddaaf':
| * | | | | | | | | | | | | | | | | am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit 'e1829730c89fe10a6487857dd433cae861ac764e':
| | * | | | | | | | | | | | | | | | 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 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit '55afe17c3c5510a0354f7e5e0480247a940bec7a':
| * | | | | | | | | | | | | | | | | | am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit '783b0862a178ec3ffba4a3d3f86d6d92f9718a66':