aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am a78045e8: am 07066382: am 197cd97c: am 26ae6f2a: am d8f0eb0d: am ↵Jean Chalard2013-10-090-0/+0
|\ | | | | | | | | | | 842d3dc4: am 19bf4335: am 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 151e4 * commit 'a78045e87a59778eb061f7f57bb6c1350dce1ca6':
| * am 07066382: am 197cd97c: am 26ae6f2a: am d8f0eb0d: am 842d3dc4: am ↵Jean Chalard2013-10-090-0/+0
| |\ | | | | | | | | | | | | | | | 19bf4335: am 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 065f1 * commit '070663822dd5d1cc810bcba43ad4e49eb6cc6fd6':
| | * 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 8d25443d: am ce9883d2: am 1b1a38a3: am bde031af: am d326890b: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d42c151e: am 110d360c: am 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 bde25 * commit '8d25443d874a455164ba6714592d5ceff2a46699':
| * | | | am ce9883d2: am 1b1a38a3: am bde031af: am d326890b: am d42c151e: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 110d360c: am 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 38c26 * commit 'ce9883d28fd1ace70e1fb1a6b2aa62f1f7cd4f59':
| | * | | 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 6fd968ff: am 64ec3027: am 5ac85de1: am 4bc5b027: am dae18483: am ↵The Android Open Source Project2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e82dc760: am fb02270d: am 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 2 * commit '6fd968ff6798a1885cd9227c11e377afb6e26d38':
| * | | | | am 64ec3027: am 5ac85de1: am 4bc5b027: am dae18483: am e82dc760: am ↵The Android Open Source Project2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb02270d: am 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 * commit '64ec302766954cabe403ce13dff6d2ff782edec9':
| | * | | | 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 b8bc83b3: am 237148cd: am a45952af: am b3d776a1: am 8912bd96: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a05e1896: am 9903f419: am 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 70747 * commit 'b8bc83b31ee479f5c050973e1559035af2303103':
| * | | | | | am 237148cd: am a45952af: am b3d776a1: am 8912bd96: am a05e1896: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9903f419: am 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 97a3c * commit '237148cd73f89ca6bd74c0dcbdb2d2b06a865e4d':
| | * | | | | 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 281efe05: am 553de413: am 99416bf1: am fbc9faeb: am d3e10466: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbc6f740: am c900edce: am 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 a38d9 * commit '281efe057a00dd0b8cb45dfb7d60df5e7e0930a1':
| * | | | | | | am 553de413: am 99416bf1: am fbc9faeb: am d3e10466: am bbc6f740: am ↵Jean Chalard2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c900edce: am 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 740da * commit '553de413b236cfcde4598e5cffa764de35aca4dd':
| | * | | | | | 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 e7bc676e: am a7aa4e4e: am f40a3dac: am d1c50150: am 9a505159: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 526b6d64: am 4986c095: am 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 7580e * commit 'e7bc676e5edf0d1a9d0462bbe248aa98b2ed6fc0':
| * | | | | | | | am a7aa4e4e: am f40a3dac: am d1c50150: am 9a505159: am 526b6d64: am ↵Tadashi G. Takaoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986c095: am 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 48d8d * commit 'a7aa4e4eb214eeeec91b24cffbf73e56bf6aacbb':
| | * | | | | | | 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 ff901c01: am cf9fd997: am 6eb43753: am e7dd8c44: am 00fe5a51: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60eedd04: am 8e6d5fb0: am 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 9bf1d * commit 'ff901c011e8d968d78d4198635f2f0a2229df535':
| * | | | | | | | | am cf9fd997: am 6eb43753: am e7dd8c44: am 00fe5a51: am 60eedd04: am ↵Jean Chalard2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e6d5fb0: am 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 2188c * commit 'cf9fd997e2d3f3996796b412bf12090fd1ed137f':
| | * | | | | | | | 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 bc3ba327: am 5cedbf68: am 382010bd: am a4ef89a9: am b56417c7: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ac77a53: am ded29a89: am 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 a657a * commit 'bc3ba327de429eee20e932e50ba20f8509eb56db':
| * | | | | | | | | | am 5cedbf68: am 382010bd: am a4ef89a9: am b56417c7: am 5ac77a53: am ↵Jean Chalard2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ded29a89: am 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 d555a * commit '5cedbf68516525a4cec249df873778f3ac2b98e6':
| | * | | | | | | | | 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 de44daac: am 677973b3: am f0a7897c: am 560dc7a9: am 9bc77d35: am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e36f1c9: am 29ac8dd8: am 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 53698 * commit 'de44daac23f407c3953fd2bf3da34393378bebaa':
| * | | | | | | | | | | am 677973b3: am f0a7897c: am 560dc7a9: am 9bc77d35: am 7e36f1c9: am ↵Baligh Uddin2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29ac8dd8: am 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 fd0e4 * commit '677973b3b97fe6ddb4bbdb818fd4ea2b3d920956':
| | * | | | | | | | | | 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 bdfdc511: am 17a801cc: am 4cdebdf1: am a7a3f66a: am f2bf72c0: am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d138dbc6: am d403a860: am 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: ( * commit 'bdfdc5114a03304d89e6ea5a12375f7b1f5af68c':
| * | | | | | | | | | | | am 17a801cc: am 4cdebdf1: am a7a3f66a: am f2bf72c0: am d138dbc6: am ↵Baligh Uddin2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d403a860: am 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 6 * commit '17a801cc8957ae97ab105307ea8e591674db7f85':
| | * | | | | | | | | | | 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 1f52fcc1: am 44acdbe9: am d0edac4a: am 2641757f: am 1e16b495: am ↵The Android Automerger2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4adc4f95: am 6f6db1de: am 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 65dfe * commit '1f52fcc19f21b4fafb30908ceea6a180586c0cb9':
| * | | | | | | | | | | | | am 44acdbe9: am d0edac4a: am 2641757f: am 1e16b495: am 4adc4f95: am ↵The Android Automerger2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f6db1de: am 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 1237c * commit '44acdbe916435162b145cc70993167cb246172f6':
| | * | | | | | | | | | | | 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':
* | | | | | | | | | | | | | | am 354a7693: am 9d6bd471: am c6416981: am 291606d4: am df3804e3: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdbcc802: am 5bab3b1a: am f6073bf0: am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c * commit '354a769351870b1388788040af7860bdeaaa4732':
| * | | | | | | | | | | | | | am 9d6bd471: am c6416981: am 291606d4: am df3804e3: am fdbcc802: am ↵Tadashi G. Takaoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bab3b1a: am f6073bf0: am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22 * commit '9d6bd471c0d7efaea1d18941707a54bf1fde73c3':
| | * | | | | | | | | | | | | am c6416981: am 291606d4: am df3804e3: am fdbcc802: am 5bab3b1a: am ↵Tadashi G. Takaoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6073bf0: am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120 * commit 'c641698112df6c46fd76b0bd572352b69bf3c166':
| | | * | | | | | | | | | | | am 291606d4: am df3804e3: am fdbcc802: am 5bab3b1a: am f6073bf0: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc1 * commit '291606d4e26cef3eab92a4c2246985a6c2adf20b':
* | | | | | | | | | | | | | | | am 4b229268: am adef7827: am 76f72ff4: am 2be36b71: am 67fbf306: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b6262c4: am 8e1fb94f: am 05cede19: am d1c14f6b: am 751cce8d: am 593432e1: am e5561f52: am 707d7d03: am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0 * commit '4b2292684dbe8831b8b811e7bb7f6babe5cdeb93':
| * | | | | | | | | | | | | | | am adef7827: am 76f72ff4: am 2be36b71: am 67fbf306: am 4b6262c4: am ↵Tadashi G. Takaoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e1fb94f: am 05cede19: am d1c14f6b: am 751cce8d: am 593432e1: am e5561f52: am 707d7d03: am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8 * commit 'adef7827d21d5c05feaf07eefde8af85063acb9a':