Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev | ztenghui | 2014-11-06 | 22 | -551/+0 | |
| | |\ \ | ||||||
| | | * | | VD:test:Remove open animation AVD | ztenghui | 2014-11-04 | 22 | -551/+0 | |
* | | | | | am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill proce... | Wale Ogunwale | 2014-11-04 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it stil... | Wale Ogunwale | 2014-11-04 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Fix issue #17305377: Don't kill process if it still has tasks. | Wale Ogunwale | 2014-11-04 | 1 | -1/+1 | |
| | |/ / | ||||||
* | | | | am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" | Kenny Root | 2014-11-03 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" | Kenny Root | 2014-11-03 | 1 | -2/+2 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | am b0cb0734: Merge "Track change to Conscrypt" | Kenny Root | 2014-11-03 | 1 | -2/+2 | |
| | |\ \ | ||||||
| | | * \ | Merge "Track change to Conscrypt" | Kenny Root | 2014-11-03 | 1 | -2/+2 | |
| | | |\ \ | ||||||
| | | | * | | Track change to Conscrypt | Kenny Root | 2014-10-31 | 1 | -2/+2 | |
* | | | | | | am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused a... | Narayan Kamath | 2014-11-03 | 1 | -93/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related... | Narayan Kamath | 2014-11-03 | 1 | -93/+0 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" | Narayan Kamath | 2014-11-03 | 1 | -93/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "Revert "Revert "Remove unused apache related API.""" | Narayan Kamath | 2014-11-03 | 1 | -93/+0 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | * | | Revert "Revert "Remove unused apache related API."" | Narayan Kamath | 2014-11-03 | 1 | -93/+0 | |
* | | | | | | am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache re... | Narayan Kamath | 2014-10-29 | 1 | -0/+93 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" | Narayan Kamath | 2014-10-29 | 1 | -0/+93 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am e87d36f8: Merge "Revert "Remove unused apache related API."" | Narayan Kamath | 2014-10-29 | 1 | -0/+93 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "Revert "Remove unused apache related API."" | Narayan Kamath | 2014-10-27 | 1 | -0/+93 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Revert "Remove unused apache related API." | Narayan Kamath | 2014-10-27 | 1 | -0/+93 | |
* | | | | | | am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp | Elliott Hughes | 2014-10-29 | 1 | -93/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp | Elliott Hughes | 2014-10-29 | 1 | -93/+0 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | resolved conflicts for merge of 9834af9c to stage-aosp-master | Narayan Kamath | 2014-10-29 | 1 | -93/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "Remove unused apache related API." | Narayan Kamath | 2014-10-27 | 1 | -93/+0 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Remove unused apache related API. | Narayan Kamath | 2014-10-24 | 1 | -93/+0 | |
* | | | | | | am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." | Narayan Kamath | 2014-10-29 | 3 | -146/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." | Narayan Kamath | 2014-10-29 | 3 | -146/+0 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am 00fd3639: Merge "Remove tests/SslLoad." | Narayan Kamath | 2014-10-29 | 3 | -146/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Remove tests/SslLoad. | Narayan Kamath | 2014-10-24 | 3 | -146/+0 | |
| | | |/ / | ||||||
| | * | | | am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev | Sandeep Siddhartha | 2014-10-09 | 5 | -4/+369 | |
| | |\ \ \ | ||||||
| | * \ \ \ | am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp... | Adam Lesinski | 2014-10-07 | 5 | -0/+79 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS pe... | Dianne Hackborn | 2014-10-06 | 1 | -1/+1 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp | Neil Fuller | 2014-10-02 | 1 | -3/+2 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | ||||||
* | | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev | John Reck | 2014-10-21 | 3 | -0/+266 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev | John Reck | 2014-10-21 | 3 | -0/+266 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | * | | | | | | Surface:lockHardwareCanvas | John Reck | 2014-10-21 | 3 | -0/+266 | |
* | | | | | | | | am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in expon... | ztenghui | 2014-10-10 | 22 | -0/+551 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data i... | ztenghui | 2014-10-10 | 22 | -0/+551 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "Support negative value in exponential data in the pathData." into lmp-... | ztenghui | 2014-10-10 | 22 | -0/+551 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Support negative value in exponential data in the pathData. | ztenghui | 2014-10-10 | 22 | -0/+551 | |
* | | | | | | | | | am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add t... | Sandeep Siddhartha | 2014-10-10 | 5 | -4/+369 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for mode... | Sandeep Siddhartha | 2014-10-10 | 5 | -4/+369 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" i... | Sandeep Siddhartha | 2014-10-10 | 5 | -4/+369 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | * | | | | | | Merge "Add tests for model management [SDK Only]" into lmp-dev | Sandeep Siddhartha | 2014-10-09 | 5 | -4/+369 | |
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | | * | | | | | Add tests for model management [SDK Only] | Sandeep Siddhartha | 2014-10-07 | 5 | -4/+369 | |
| | | | | |_|_|/ | | | | |/| | | | ||||||
* | | | | | | | | am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the s... | ztenghui | 2014-10-10 | 3 | -1/+30 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data ... | ztenghui | 2014-10-10 | 3 | -1/+30 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "Support dot separation as the svg path data did." into lmp-mr1-dev | ztenghui | 2014-10-09 | 3 | -1/+30 | |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | ||||||
| | | * | | | | | Support dot separation as the svg path data did. | ztenghui | 2014-10-08 | 3 | -1/+30 | |
* | | | | | | | | am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load ... | Adam Lesinski | 2014-10-07 | 5 | -0/+79 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |