Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Use more intention-revealing tests for S_ISLNK and S_ISSOCK. | Elliott Hughes | 2015-01-12 | 1 | -1/+3 | |
* | | | | am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource at... | Adam Lesinski | 2014-12-11 | 1 | -0/+17 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul... | Adam Lesinski | 2014-12-11 | 1 | -0/+17 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Fix issue where non-resource attributes would cause obtainStyleAttributes to ... | Adam Lesinski | 2014-12-10 | 1 | -0/+17 | |
* | | | | am e97908d3: Merge commit \'0953ab27\' into manualmerge | Adam Lesinski | 2014-12-05 | 1 | -48/+57 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge commit '0953ab27' into manualmerge | Adam Lesinski | 2014-12-05 | 1 | -48/+57 | |
| |\ \ \ | | |/ / | ||||||
| | * | | AAPT: Move private attrs to new type for framework | Adam Lesinski | 2014-12-03 | 1 | -46/+57 | |
* | | | | am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system o... | Adam Lesinski | 2014-12-04 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" | Adam Lesinski | 2014-12-04 | 1 | -0/+6 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Merge "RRO: prevent duplicate system overlays" | Adam Lesinski | 2014-12-03 | 1 | -0/+6 | |
| | |\ \ | ||||||
| | | * | | RRO: prevent duplicate system overlays | Mårten Kongstad | 2014-11-07 | 1 | -0/+6 | |
* | | | | | am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-03 | 2 | -5/+9 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-02 | 2 | -5/+9 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge changes If2c7e09f,Ie21f227c | Adam Lesinski | 2014-12-02 | 2 | -5/+9 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | RRO idmap: pad with 0xffffffff, not 0x00000000 | Mårten Kongstad | 2014-11-07 | 1 | -5/+5 | |
| | | * | | RRO: reintroduce lost ResTable insert of assets | Mårten Kongstad | 2014-11-07 | 1 | -0/+4 | |
* | | | | | am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." | Elliott Hughes | 2014-11-22 | 1 | -8/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." | Elliott Hughes | 2014-11-22 | 1 | -8/+0 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | We HAVE_LITTLE_ENDIAN. | Elliott Hughes | 2014-11-21 | 1 | -8/+0 | |
* | | | | | am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge commit '06d8b7b8' into manualmerge | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Merge "Implement back-tracking when searching for attributes in XML or resour... | Adam Lesinski | 2014-11-17 | 3 | -3/+119 | |
| | |\ \ \ | ||||||
| | | * | | | Implement back-tracking when searching for attributes in XML or resource bag | Adam Lesinski | 2014-11-04 | 3 | -3/+119 | |
* | | | | | | am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." | Elliott Hughes | 2014-11-10 | 1 | -15/+4 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." | Elliott Hughes | 2014-11-10 | 1 | -15/+4 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | bionic's struct stat is now POSIX-compliant. | Elliott Hughes | 2014-11-10 | 1 | -15/+4 | |
* | | | | | | am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings" | Andreas Gampe | 2014-11-09 | 3 | -11/+5 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 189bf056: Merge "Frameworks/base: Fix more warnings" | Andreas Gampe | 2014-11-09 | 3 | -11/+5 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Frameworks/base: Fix more warnings | Andreas Gampe | 2014-11-07 | 3 | -11/+5 | |
* | | | | | | am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-p... | Andreas Gampe | 2014-11-07 | 10 | -247/+410 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-11-07 | 10 | -247/+410 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Frameworks/base: Wall Werror in libs/androidfw | Andreas Gampe | 2014-11-07 | 10 | -248/+410 | |
| | | |_|/ | | |/| | | ||||||
| | * | | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master | Bill Yi | 2014-10-22 | 52 | -1223/+4136 | |
| | |\ \ \ | ||||||
| | | * \ \ | am aeef612f: Merge "Search all packages for a given type string when looking ... | Adam Lesinski | 2014-10-09 | 2 | -43/+60 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s... | Adam Powell | 2014-10-01 | 1 | -5/+1 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li... | Adam Lesinski | 2014-10-01 | 1 | -1/+5 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp | Dan Albert | 2014-09-19 | 1 | -1/+0 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi... | Adam Lesinski | 2014-09-19 | 2 | -1/+41 | |
| | | |\ \ \ \ \ \ \ | ||||||
* | | | \ \ \ \ \ \ \ | am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-d... | Adam Lesinski | 2014-11-05 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge commit 'fb96e54' into manualmerge | Adam Lesinski | 2014-11-05 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Add error checking to aapt for split generation | Adam Lesinski | 2014-11-03 | 1 | -0/+4 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | am 3fd34002: Merge commit \'78be0498\' into manualmerge | Adam Lesinski | 2014-11-04 | 4 | -44/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge commit '78be0498' into manualmerge | Adam Lesinski | 2014-11-03 | 4 | -44/+32 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-dev | Adam Lesinski | 2014-11-03 | 4 | -56/+44 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Fix issues that will be present in C++11 | Adam Lesinski | 2014-11-03 | 4 | -56/+44 | |
* | | | | | | | | | | | am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and exp... | Alan Viverette | 2014-10-31 | 1 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va... | Alan Viverette | 2014-10-31 | 1 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Distinguish unspecified and explicit null values in resources | Alan Viverette | 2014-10-29 | 1 | -1/+15 | |
* | | | | | | | | | | | am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library wh... | Adam Lesinski | 2014-10-28 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 31b76b66: Merge "libandroidfw: Do not build device library when building S... | Adam Lesinski | 2014-10-28 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / |