summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | am 6bd8d825: am c4aea977: am e6c0bda5: Merge "Make points drawn with default ...Rob Tsuk2014-11-041-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible...Rob Tsuk2014-11-041-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Make points drawn with default paint visible" into lmp-mr1-devRob Tsuk2014-11-041-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Make points drawn with default paint visibleRob Tsuk2014-11-041-1/+1
* | | | | | | am 3fd34002: Merge commit \'78be0498\' into manualmergeAdam Lesinski2014-11-044-44/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-034-44/+32
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-034-56/+44
| | |\ \ \ \ \
| | | * | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-034-56/+44
* | | | | | | | am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c...John Reck2014-11-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 541641d0: Merge "Fix counting" into lmp-mr1-devJohn Reck2014-11-031-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix countingJohn Reck2014-11-031-1/+1
* | | | | | | | partially fix build.Nick Kralevich2014-11-012-0/+2
* | | | | | | | am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a...John Reck2014-10-3125-187/+161
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a8d83d63: Merge "Layer changes" into lmp-mr1-devJohn Reck2014-10-3125-187/+161
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Layer changes" into lmp-mr1-devJohn Reck2014-10-3125-187/+161
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Layer changesJohn Reck2014-10-3125-187/+161
| | | | |/ / / | | | |/| | |
* | | | | | | am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and exp...Alan Viverette2014-10-311-1/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...Alan Viverette2014-10-311-1/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+15
| | |/ / / /
* | | | | | am 97054254: am 141823ec: Merge "Be more conservative about current buffer" i...John Reck2014-10-301-5/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-devJohn Reck2014-10-301-5/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Be more conservative about current buffer" into lmp-mr1-devJohn Reck2014-10-291-5/+4
| | |\ \ \ \
| | | * | | | Be more conservative about current bufferJohn Reck2014-10-271-5/+4
| | | |/ / /
* | | | | | am 3cad510e: am 4ed472ab: resolved conflicts for merge of 3028394c to stage-a...Narayan Kamath2014-10-292-1/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-masterNarayan Kamath2014-10-292-1/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | resolved conflicts for merge of 3028394c to stage-aosp-masterNarayan Kamath2014-10-292-1/+9
| | |\ \ \ \
| | | * | | | Suppress Clang compilation warnings.Chih-Hung Hsieh2014-10-246-7/+17
| | * | | | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-22204-6025/+26993
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am aeef612f: Merge "Search all packages for a given type string when looking ...Adam Lesinski2014-10-092-43/+60
| | | |\ \ \ \
| | | * \ \ \ \ am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-036-41/+36
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into ...ztenghui2014-10-011-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...Adam Powell2014-10-011-5/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...Adam Lesinski2014-10-011-1/+5
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more conservatively...Chris Craik2014-09-231-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-devChris Craik2014-09-191-1/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-192-3/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-192-1/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into...Chris Craik2014-09-194-2/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library wh...Adam Lesinski2014-10-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 31b76b66: Merge "libandroidfw: Do not build device library when building S...Adam Lesinski2014-10-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "libandroidfw: Do not build device library when building SDK" into lmp-...Adam Lesinski2014-10-281-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | libandroidfw: Do not build device library when building SDKAdam Lesinski2014-10-241-0/+3
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaa...John Reck2014-10-289-93/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaadJohn Reck2014-10-289-93/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Cleanup debug optionsJohn Reck2014-10-279-93/+58
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 705f2ac4: am 879f237a: Merge "Added some more Split density tests" into lm...Adam Lesinski2014-10-2436-157/+803
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-devAdam Lesinski2014-10-2436-157/+803
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Added some more Split density tests" into lmp-mr1-devAdam Lesinski2014-10-2336-157/+803
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \