summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Fix build.Dianne Hackborn2013-05-211-1/+1
* Merge "aapt: move qsort_r_compat here as it is sole client"Dima Zavin2013-05-084-2/+132
|\
| * aapt: move qsort_r_compat here as it is sole clientDima Zavin2013-05-074-2/+132
* | desperate attempt to fix linux build.Mathias Agopian2013-05-071-1/+1
* | libutils clean-upMathias Agopian2013-05-077-3/+296
|/
* Merge commit 'b3f66877' into afdmergeJeff Sharkey2013-04-291-0/+1
|\
| * Document the 'aapt dump strings' commandMÃ¥rten Kongstad2013-04-291-0/+1
* | am 9e69a2ce: am 03ce5b53: Fix build.Ying Wang2013-04-291-1/+1
|\ \
| * | Fix build.Ying Wang2013-04-261-1/+1
* | | am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-devKenny Root2013-04-292-1/+12
|\ \ \ | |/ /
| * | Merge "Update preloaded classes" into jb-mr2-devKenny Root2013-04-262-1/+12
| |\ \
| | * | Update preloaded classesKenny Root2013-04-262-1/+12
* | | | Merge "Allow compiling aapt for the device"Bjorn Bringert2013-04-294-6/+167
|\ \ \ \
| * | | | Allow compiling aapt for the deviceBjorn Bringert2013-04-264-6/+167
* | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-59/+55
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-59/+55
| |/ /
* | | First draft of Scenes & Transitions featureChet Haase2013-04-181-0/+51
* | | am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final ...Xavier Ducrohet2013-04-131-12/+5
|\ \ \ | |/ /
| * | Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
* | | am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final I...Xavier Ducrohet2013-04-121-5/+12
|\ \ \ | |/ /
| * | Make --non-constant-id generates non final IDs for styleable.Xavier Ducrohet2013-04-121-5/+12
* | | resolved conflicts for merge of a976bddd to masterYing Wang2013-04-093-4/+6
|\ \ \ | |/ /
| * | Add liblogYing Wang2013-04-093-4/+6
* | | resolved conflicts for merge of 21dffd5d to masterJeff Brown2013-04-083-23/+10
|\ \ \ | |/ /
| * | Merge "Queues, queues, queues and input." into jb-mr2-devJeff Brown2013-04-083-23/+10
| |\ \
| | * | Queues, queues, queues and input.Jeff Brown2013-04-083-23/+10
* | | | am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permissi...Nick Kralevich2013-04-041-0/+8
|\ \ \ \ | |/ / /
| * | | Merge "aapt: add support for optional uses-permission" into jb-mr2-devNick Kralevich2013-04-051-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | aapt: add support for optional uses-permissionNick Kralevich2013-04-031-0/+8
* | | | resolved conflicts for merge of 5856ee4b to masterBrian Colonna2013-04-021-0/+4
|\ \ \ \ | |/ / /
| * | | FUL now restarts when flipping tablet 180 (bug 7484464)Brian Colonna2013-03-291-0/+4
| |/ /
* | | am 483ac9a7: am b404ecc9: Merge "Fix build." into jb-mr2-devDianne Hackborn2013-03-261-0/+21
|\ \ \ | |/ /
| * | Fix build.Dianne Hackborn2013-03-261-0/+21
* | | Update layoutlib to latest interface.Craig Mautner2013-03-181-2/+2
* | | am 892e0782: am ad4a174b: Merge "Fix build." into jb-mr2-devDianne Hackborn2013-03-051-0/+7
|\ \ \ | |/ /
| * | Fix build.Dianne Hackborn2013-03-051-0/+7
| * | Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-devCraig Mautner2013-02-261-0/+18
| |\ \ |/ / /
| * | Revert ActivityManager changes for tasks. DO NOT MERGECraig Mautner2013-02-251-0/+18
* | | Fix typo.Dianne Hackborn2013-02-251-1/+1
|/ /
* | Formalize overscan metrics.Dianne Hackborn2013-02-222-2/+2
* | am ec6156f9: Merge "Fix the build."Jim Miller2013-02-201-0/+8
|\ \
| * | Fix the build.Jim Miller2013-02-201-0/+8
* | | am ee973c27: Fix build.Dianne Hackborn2013-02-191-0/+6
|\ \ \ | |/ /
| * | Fix build.Dianne Hackborn2013-02-191-0/+6
* | | am 7c93839d: Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ \ | |/ /
| * | Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
* | | am 8acb27c5: Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ \ | |/ /
| * | Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
| |\ \
| | * | Tentative fix for aidl import issueLaurent Tu2013-02-141-1/+1
* | | | am 534d136a: Merge "Remove unused App methods."Craig Mautner2013-02-141-18/+0
|\ \ \ \ | |/ / /