aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 040b68a5: am 22e17809: am a1c80285: am cc34a551: am f067287e: am ↵Satoshi Kataoka2013-10-090-0/+0
|\ | | | | | | | | | | 9feb95cd: am 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 "M * commit '040b68a5ff981270ec3116112fe1fe0fe02cc91c':
| * 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 4ac529f1: am 5f35ef27: am 9875b776: am 9407a2c0: am f47c3325: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1500eda: am 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 "A * commit '4ac529f14b95e72fd27493fd2a085c01f5af4223':
| * | | | 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 197cd97c: am 26ae6f2a: am d8f0eb0d: am 842d3dc4: am 19bf4335: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ab974c1: am 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 "F * commit '197cd97ce20db3199a823b2f86c9cdc037fdb55d':
| * | | | | 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':
| | | * | | am 842d3dc4: am 19bf4335: am 4ab974c1: am a034f847: am ef9ab1c6: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 surrogate pairs. * commit '842d3dc40f4d6012bcb0438d68083fa4e62f98e8':
* | | | | | | am 1b1a38a3: am bde031af: am d326890b: am d42c151e: am 110d360c: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 693aaa0f: am fe92ae2d: am 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dic * commit '1b1a38a3a506436ade5eb80f3ba819e8a1656f97':
| * | | | | | am bde031af: am d326890b: am d42c151e: am 110d360c: am 693aaa0f: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe92ae2d: am 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'bde031afc6ba47eca320932cdff626e21881c2cb':
| | * | | | | am d326890b: am d42c151e: am 110d360c: am 693aaa0f: am fe92ae2d: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'd326890b28eb9dfe487231092885475d382193f1':
| | | * | | | am d42c151e: am 110d360c: am 693aaa0f: am fe92ae2d: am 817a43a9: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP * commit 'd42c151e8cb463e4b56be58598cd7e5def5daf36':
* | | | | | | | am 5ac85de1: am 4bc5b027: am dae18483: am e82dc760: am fb02270d: am ↵The Android Open Source Project2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 569ca6b5: am 6c21cf51: am 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 7061 * commit '5ac85de19213ca3c8cea56727b24f3fc30d0f496':
| * | | | | | | am 4bc5b027: am dae18483: am e82dc760: am fb02270d: am 569ca6b5: am ↵The Android Open Source Project2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c21cf51: am 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5 * commit '4bc5b0273310417ac98854a47cea9ed014018da5':
| | * | | | | | am dae18483: am e82dc760: am fb02270d: am 569ca6b5: am 6c21cf51: am ↵The Android Open Source Project2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1de * commit 'dae184832918d77b7e33e6cc401e5e3f5e93dfb1':
| | | * | | | | am e82dc760: am fb02270d: am 569ca6b5: am 6c21cf51: am 7a43a60d: am ↵The Android Open Source Project2013-10-030-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s our * commit 'e82dc76054ca53dfb29c207cb61673c54b2aaeeb':
* | | | | | | | | am a45952af: am b3d776a1: am 8912bd96: am a05e1896: am 9903f419: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f9d9e9b: am 27add2a2: am 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "R * commit 'a45952af67b94643eef7d2f9c2f4625b2dfa77b6':
| * | | | | | | | am b3d776a1: am 8912bd96: am a05e1896: am 9903f419: am 6f9d9e9b: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27add2a2: am 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit 'b3d776a1a559aaa374a8517a710a537e0531c404':
| | * | | | | | | am 8912bd96: am a05e1896: am 9903f419: am 6f9d9e9b: am 27add2a2: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit '8912bd96af94cadabfc5a195e08213d61f9c1719':
| | | * | | | | | am a05e1896: am 9903f419: am 6f9d9e9b: am 27add2a2: am 175d4e55: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor" * commit 'a05e1896d11f01568b54da9177bb7e2c8a5e39bc':
* | | | | | | | | | am 99416bf1: am fbc9faeb: am d3e10466: am bbc6f740: am c900edce: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a298f4: am d2564cea: am a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an N * commit '99416bf12adadf6e4d645b3df0d83c57af7c4fda':
| * | | | | | | | | am fbc9faeb: am d3e10466: am bbc6f740: am c900edce: am d9a298f4: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2564cea: am a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit 'fbc9faeb33a12966d4ce3e6ded4e849cb7d6527b':
| | * | | | | | | | am d3e10466: am bbc6f740: am c900edce: am d9a298f4: am d2564cea: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit 'd3e104667244a0858ad155d2805c361b4b87eb00':
| | | * | | | | | | am bbc6f740: am c900edce: am d9a298f4: am d2564cea: am a1ff71f0: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE * commit 'bbc6f740bbadd0e8fae9ffc69b9b8c24697d7461':
* | | | | | | | | | | am f40a3dac: am d1c50150: am 9a505159: am 526b6d64: am 4986c095: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31965739: am 960a13fe: am 08898684: am 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix pote * commit 'f40a3dac4894f821e3ab26c1a7d6070396170579':
| * | | | | | | | | | am d1c50150: am 9a505159: am 526b6d64: am 4986c095: am 31965739: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 960a13fe: am 08898684: am 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in * commit 'd1c50150f3b7e03d3bb2a38cef3bba52c2ea43f1':
| | * | | | | | | | | am 9a505159: am 526b6d64: am 4986c095: am 31965739: am 960a13fe: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08898684: am 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardV * commit '9a505159488737afba74dd37220e4912ba31aae0':
| | | * | | | | | | | am 526b6d64: am 4986c095: am 31965739: am 960a13fe: am 08898684: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerH * commit '526b6d646ef5e587ee8fc56419f3ad8d0817f46c':
* | | | | | | | | | | | am 6eb43753: am e7dd8c44: am 00fe5a51: am 60eedd04: am 8e6d5fb0: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54692476: am ff6f8561: am 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "F * commit '6eb43753bc0bf051243eaa3d99aefdfeb90dc22c':
| * | | | | | | | | | | am e7dd8c44: am 00fe5a51: am 60eedd04: am 8e6d5fb0: am 54692476: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6f8561: am 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" * commit 'e7dd8c44dd2d5a74d333a6eeba813f7827476e5e':
| | * | | | | | | | | | am 00fe5a51: am 60eedd04: am 8e6d5fb0: am 54692476: am ff6f8561: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" * commit '00fe5a5181449a2b148b226157087a6f317382b5':
| | | * | | | | | | | | am 60eedd04: am 8e6d5fb0: am 54692476: am ff6f8561: am 615c8b66: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" * commit '60eedd04ae6076484f6eacb47bfa9c4768ce6ca2':
* | | | | | | | | | | | | am 382010bd: am a4ef89a9: am b56417c7: am 5ac77a53: am ded29a89: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a4a2dcf: am 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "C * commit '382010bd7039b7cd032547634c19bfdc4de6a939':
| * | | | | | | | | | | | am a4ef89a9: am b56417c7: am 5ac77a53: am ded29a89: am 2a4a2dcf: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup" * commit 'a4ef89a96dfea1f15a73d57f21465654a09f64da':
| | * | | | | | | | | | | am b56417c7: am 5ac77a53: am ded29a89: am 2a4a2dcf: am 00f378d6: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup" * commit 'b56417c739218c3f83593c9bc8a08725af39913f':
| | | * | | | | | | | | | am 5ac77a53: am ded29a89: am 2a4a2dcf: am 00f378d6: am 6571290c: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup" * commit '5ac77a532a8b4ec3a5718eb0bcae34e503021c41':
* | | | | | | | | | | | | | am f0a7897c: am 560dc7a9: am 9bc77d35: am 7e36f1c9: am 29ac8dd8: am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3710ff0e: am d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07 * commit 'f0a7897cce9a55270ef66bb634356a07efb13360':
| * | | | | | | | | | | | | am 560dc7a9: am 9bc77d35: am 7e36f1c9: am 29ac8dd8: am 3710ff0e: am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02 * commit '560dc7a9494d70bd36c458fa087bd324116e7a38':
| | * | | | | | | | | | | | am 9bc77d35: am 7e36f1c9: am 29ac8dd8: am 3710ff0e: am d6f1fba4: am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep his * commit '9bc77d35193797708323365c6a208a5be2939576':
| | | * | | | | | | | | | | am 7e36f1c9: am 29ac8dd8: am 3710ff0e: am d6f1fba4: am 0151b947: am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after re * commit '7e36f1c9c04b4614070c2f459ede1705303898ae':
* | | | | | | | | | | | | | | am 4cdebdf1: am a7a3f66a: am f2bf72c0: am d138dbc6: am d403a860: am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41236d61: am 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0 * commit '4cdebdf1a7a1031b915a2dc28c346f95c1680f34':
| * | | | | | | | | | | | | | am a7a3f66a: am f2bf72c0: am d138dbc6: am d403a860: am 41236d61: am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am f * commit 'a7a3f66ab0644f453238999f53eb988da1d3eef0':
| | * | | | | | | | | | | | | am f2bf72c0: am d138dbc6: am d403a860: am 41236d61: am 2f1f1df4: am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s * commit 'f2bf72c099212d54a1280b793ba3de143c056ef8':
| | | * | | | | | | | | | | | am d138dbc6: am d403a860: am 41236d61: am 2f1f1df4: am f61619af: am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcb * commit 'd138dbc6d62aa82b19ad37d3a14eafa5f433eea4':
* | | | | | | | | | | | | | | | am d0edac4a: am 2641757f: am 1e16b495: am 4adc4f95: am 6f6db1de: am ↵The Android Automerger2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6548fea2: am 0de714bf: am 1e944609: am f4ed91f5: am 8435a9b8: am abaea38f: am 13ac43b3: am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de * commit 'd0edac4a70c43c2d75ae55d49ce91ad86d8c6d36':
| * | | | | | | | | | | | | | | am 2641757f: am 1e16b495: am 4adc4f95: am 6f6db1de: am 6548fea2: am ↵The Android Automerger2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de714bf: am 1e944609: am f4ed91f5: am 8435a9b8: am abaea38f: am 13ac43b3: am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d5 * commit '2641757fb083fbd129f57d8753096f0a95f18e2d':