summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 0e30b140: am fe8c0080: am 8ff6f579: Merge "AAPT: Filtering resource fix" i...Adam Lesinski2014-08-253-6/+52
|\
| * am fe8c0080: am 8ff6f579: Merge "AAPT: Filtering resource fix" into lmp-devAdam Lesinski2014-08-223-6/+52
| |\
| | * AAPT: Filtering resource fixAdam Lesinski2014-08-223-6/+52
* | | am c3b28395: am b5a92f26: am f064f669: Merge "AAPT: Dump installLocation in b...Adam Lesinski2014-08-221-0/+28
|\ \ \ | |/ /
| * | am b5a92f26: am f064f669: Merge "AAPT: Dump installLocation in badging" into ...Adam Lesinski2014-08-221-0/+28
| |\ \ | | |/
| | * AAPT: Dump installLocation in badgingAdam Lesinski2014-08-221-0/+28
* | | am f425ba28: am 420a3801: am 247d27d1: Merge "Add better error message for AA...Adam Lesinski2014-08-211-9/+11
|\ \ \ | |/ /
| * | am 420a3801: am 247d27d1: Merge "Add better error message for AAPT file confl...Adam Lesinski2014-08-211-9/+11
| |\ \ | | |/
| | * Merge "Add better error message for AAPT file conflicts" into lmp-devAdam Lesinski2014-08-211-9/+11
| | |\
| | | * Add better error message for AAPT file conflictsAdam Lesinski2014-08-211-9/+11
* | | | am 13c95b62: am 4a3f39a2: am db2a74d4: Merge "AAPT: mipmaps should not end up...Adam Lesinski2014-08-214-10/+70
|\ \ \ \ | |/ / /
| * | | am 4a3f39a2: am db2a74d4: Merge "AAPT: mipmaps should not end up in Splits" i...Adam Lesinski2014-08-214-10/+70
| |\ \ \ | | |/ /
| | * | AAPT: mipmaps should not end up in SplitsAdam Lesinski2014-08-214-10/+70
| | |/
* | | am 34b21847: am ad876f74: am 3a0a53a9: Merge "Use the correct versionCode for...Adam Lesinski2014-08-211-0/+7
|\ \ \ | |/ /
| * | am ad876f74: am 3a0a53a9: Merge "Use the correct versionCode for Split APKs" ...Adam Lesinski2014-08-211-0/+7
| |\ \ | | |/
| | * Use the correct versionCode for Split APKsAdam Lesinski2014-08-211-0/+7
* | | am a22046e2: am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating...Adam Lesinski2014-08-211-17/+14
|\ \ \ | |/ /
| * | am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating dynamic ref ...Adam Lesinski2014-08-211-17/+14
| |\ \ | | |/
| | * AAPT: Fix regression generating dynamic ref table for shared librariesAdam Lesinski2014-08-201-17/+14
* | | am 015f660a: am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in ...Deepanshu Gupta2014-08-201-2/+3
|\ \ \ | |/ /
| * | am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in LayoutLib." i...Deepanshu Gupta2014-08-201-2/+3
| |\ \ | | |/
| | * Merge "Fix "@null" resource values in LayoutLib." into lmp-devDeepanshu Gupta2014-08-191-2/+3
| | |\
| | | * Fix "@null" resource values in LayoutLib.Deepanshu Gupta2014-08-191-2/+3
* | | | am 6a006b9a: am 6cd282f4: am df6d9cd8: Merge "Add time to status bar and fix ...Deepanshu Gupta2014-08-209-29/+146
|\ \ \ \ | |/ / /
| * | | am 6cd282f4: am df6d9cd8: Merge "Add time to status bar and fix wifi icon." i...Deepanshu Gupta2014-08-209-29/+146
| |\ \ \ | | |/ /
| | * | Merge "Add time to status bar and fix wifi icon." into lmp-devDeepanshu Gupta2014-08-199-29/+146
| | |\ \ | | | |/
| | | * Add time to status bar and fix wifi icon.Deepanshu Gupta2014-08-189-29/+146
* | | | am 38e7e051: am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reu...Adam Lesinski2014-08-191-16/+17
|\ \ \ \ | |/ / /
| * | | am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reuse existing I...Adam Lesinski2014-08-191-16/+17
| |\ \ \ | | |/ /
| | * | Allow enum generated IDs to reuse existing IDsAdam Lesinski2014-08-191-16/+17
* | | | am 1e188ad9: am aae8a25a: am 427964ed: Merge "Include build number in aapt ve...Adam Lesinski2014-08-192-1/+13
|\ \ \ \ | |/ / /
| * | | am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into l...Adam Lesinski2014-08-192-1/+13
| |\ \ \ | | |/ /
| | * | Include build number in aapt versionAdam Lesinski2014-08-182-1/+13
| | |/
* | | am 8efa12ef: am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in...Adam Lesinski2014-08-182-2/+1
|\ \ \ | |/ /
| * | am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version...Adam Lesinski2014-08-182-2/+1
| |\ \ | | |/
| | * Revert "Include build number in aapt version"Adam Lesinski2014-08-182-2/+1
* | | am 9e2f9205: am fdbcc8e5: am a7ce555e: Include build number in aapt versionAdam Lesinski2014-08-182-1/+2
|\ \ \ | |/ /
| * | am fdbcc8e5: am a7ce555e: Include build number in aapt versionAdam Lesinski2014-08-182-1/+2
| |\ \ | | |/
| | * Include build number in aapt versionAdam Lesinski2014-08-182-1/+2
* | | am 1367411f: am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: U...Deepanshu Gupta2014-08-186-0/+0
|\ \ \ | |/ /
| * | am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi an...Deepanshu Gupta2014-08-186-0/+0
| |\ \ | | |/
| | * am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-186-0/+0
| | |\
| | | * am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | |\
| | | | * Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | * | am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e:...Deepanshu Gupta2014-08-063-49/+107
| | | |\ \ | | | | |/
| | | | * am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2:...Deepanshu Gupta2014-08-063-49/+107
| | | | |\
| | | | | * am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678:...Deepanshu Gupta2014-08-063-49/+107
| | | | | |\
| | | | | | * am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b:...Deepanshu Gupta2014-08-063-49/+107
| | | | | | |\
| | | | | | | * am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2:...Deepanshu Gupta2014-08-063-49/+107
| | | | | | | |\
| | | | | | | | * am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved con...Deepanshu Gupta2014-08-063-49/+107
| | | | | | | | |\