| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 537888be: Merge "kill HAVE_LOCALTIME_R" | Yabin Cui | 2014-11-13 | 1 | -2/+2 |
| |\ | |||||
| | * | kill HAVE_LOCALTIME_R | Yabin Cui | 2014-11-13 | 1 | -2/+2 |
| * | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp | Dan Albert | 2014-11-12 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | Move frameworks/base over to libc++. | Dan Albert | 2014-11-12 | 1 | -1/+0 |
| * | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1... | Adam Lesinski | 2014-11-11 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | AAPT: Ignore densities specified in -c flag | Adam Lesinski | 2014-11-10 | 1 | -0/+7 |
| * | | | am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ... | Adam Lesinski | 2014-11-11 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fixing NULL pointer access causing segmentation fault in aapt | Jörgen Ekström | 2014-11-07 | 1 | -1/+1 |
| | * | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." | Dan Albert | 2014-10-20 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ... | Adam Lesinski | 2014-10-20 | 1 | -1/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ... | Adam Lesinski | 2014-10-17 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am f47f8855: Merge "Added a daemon mode to aapt to receive streams of command... | Jerome Dochez | 2014-10-10 | 4 | -0/+40 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl... | Adam Lesinski | 2014-10-03 | 1 | -20/+26 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" | Andreas Gampe | 2014-10-02 | 4 | -30/+51 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp | Andreas Gampe | 2014-10-01 | 13 | -387/+540 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev | Stephen Hines | 2014-10-01 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp | Dan Albert | 2014-10-01 | 5 | -142/+22 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh... | Adam Lesinski | 2014-09-26 | 2 | -1/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu... | Adam Lesinski | 2014-09-22 | 9 | -36/+316 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp | Dan Albert | 2014-09-19 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi... | Adam Lesinski | 2014-09-19 | 3 | -3/+225 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'fa31eb2c' into manualmerge | Adam Lesinski | 2014-11-10 | 4 | -22/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | split-select: Fix rules generated for anydpi density | Adam Lesinski | 2014-11-06 | 4 | -22/+55 |
| * | | | | | | | | | | | | | | | | Merge commit 'fb96e54' into manualmerge | Adam Lesinski | 2014-11-05 | 8 | -5/+238 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Add error checking to aapt for split generation | Adam Lesinski | 2014-11-03 | 8 | -5/+237 |
| * | | | | | | | | | | | | | | | | Fix automerge issue | Adam Lesinski | 2014-11-03 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp | Adam Lesinski | 2014-11-04 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Fix build due to bad merge | Adam Lesinski | 2014-11-03 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | | am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 su... | Adam Lesinski | 2014-11-04 | 1 | -3/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev | Adam Lesinski | 2014-11-03 | 1 | -3/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Build the split-select tool without C++11 support | Adam Lesinski | 2014-11-03 | 1 | -3/+37 |
| * | | | | | | | | | | | | | | | | | Merge commit '78be0498' into manualmerge | Adam Lesinski | 2014-11-03 | 7 | -43/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Fix issues that will be present in C++11 | Adam Lesinski | 2014-11-03 | 9 | -63/+64 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 | Tim Kilbourn | 2014-10-24 | 1 | -1/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | aapt updates for Android TV | Tim Kilbourn | 2014-10-24 | 1 | -1/+24 |
| * | | | | | | | | | | | | | | | | Merge commit 'cd8442d4' into manualmerge | Adam Lesinski | 2014-10-23 | 4 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | First commit of split-select tool | Adam Lesinski | 2014-10-23 | 4 | -7/+10 |
| * | | | | | | | | | | | | | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." | Dan Albert | 2014-10-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fix an overflow found by ASAN. | Dan Albert | 2014-10-20 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for... | Adam Lesinski | 2014-10-20 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources... | Adam Lesinski | 2014-10-20 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | AAPT: Fix path for final generated resources on Windows | Adam Lesinski | 2014-10-20 | 1 | -1/+4 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue... | Adam Lesinski | 2014-10-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was... | Adam Lesinski | 2014-10-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | AAPT: Fix an issue where a resource name was incorrectly derived on Windows | Adam Lesinski | 2014-10-17 | 1 | -1/+1 |
| | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | | am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes"... | Adam Lesinski | 2014-10-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Minor resource notation/compatibility fixes | Adam Lesinski | 2014-10-17 | 1 | -3/+3 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon mod... | Jerome Dochez | 2014-10-10 | 4 | -0/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Added a daemon mode to aapt to receive streams of commands from gradle... | Jerome Dochez | 2014-10-10 | 4 | -0/+40 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added a daemon mode to aapt to receive streams of commands from gradle. | Jerome Dochez | 2014-10-02 | 4 | -0/+40 |
| | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |