Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am fc691f9d: am 417e512b: Merge "Add missing native methods." into jb-mr2-dev | Deepanshu Gupta | 2013-05-24 | 6 | -36/+94 |
|\ | |||||
| * | am 417e512b: Merge "Add missing native methods." into jb-mr2-dev | Deepanshu Gupta | 2013-05-24 | 6 | -36/+94 |
| |\ | |||||
| | * | Add missing native methods. | Deepanshu Gupta | 2013-05-23 | 6 | -36/+94 |
| * | | am bd1730de: Merge "Document the \'aapt dump strings\' command" | Christopher Tate | 2013-04-29 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
* | | | Fix build. | Dianne Hackborn | 2013-05-21 | 1 | -1/+1 |
* | | | Merge "aapt: move qsort_r_compat here as it is sole client" | Dima Zavin | 2013-05-08 | 4 | -2/+132 |
|\ \ \ | |||||
| * | | | aapt: move qsort_r_compat here as it is sole client | Dima Zavin | 2013-05-07 | 4 | -2/+132 |
* | | | | desperate attempt to fix linux build. | Mathias Agopian | 2013-05-07 | 1 | -1/+1 |
* | | | | libutils clean-up | Mathias Agopian | 2013-05-07 | 7 | -3/+296 |
|/ / / | |||||
* | | | Merge commit 'b3f66877' into afdmerge | Jeff Sharkey | 2013-04-29 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Document the 'aapt dump strings' command | MÃ¥rten Kongstad | 2013-04-29 | 1 | -0/+1 |
* | | | am 9e69a2ce: am 03ce5b53: Fix build. | Ying Wang | 2013-04-29 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix build. | Ying Wang | 2013-04-26 | 1 | -1/+1 |
* | | | am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev | Kenny Root | 2013-04-29 | 2 | -1/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge "Update preloaded classes" into jb-mr2-dev | Kenny Root | 2013-04-26 | 2 | -1/+12 |
| |\ \ | |||||
| | * | | Update preloaded classes | Kenny Root | 2013-04-26 | 2 | -1/+12 |
* | | | | Merge "Allow compiling aapt for the device" | Bjorn Bringert | 2013-04-29 | 4 | -6/+167 |
|\ \ \ \ | |||||
| * | | | | Allow compiling aapt for the device | Bjorn Bringert | 2013-04-26 | 4 | -6/+167 |
* | | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp | Jeff Brown | 2013-04-26 | 1 | -59/+55 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Generate SDK docs for v7 support library packages. | Jeff Brown | 2013-04-26 | 1 | -59/+55 |
| |/ / | |||||
* | | | First draft of Scenes & Transitions feature | Chet Haase | 2013-04-18 | 1 | -0/+51 |
* | | | am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final ... | Xavier Ducrohet | 2013-04-13 | 1 | -12/+5 |
|\ \ \ | |/ / | |||||
| * | | Revert "Make --non-constant-id generates non final IDs for styleable." | Xavier Ducrohet | 2013-04-13 | 1 | -12/+5 |
* | | | am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final I... | Xavier Ducrohet | 2013-04-12 | 1 | -5/+12 |
|\ \ \ | |/ / | |||||
| * | | Make --non-constant-id generates non final IDs for styleable. | Xavier Ducrohet | 2013-04-12 | 1 | -5/+12 |
* | | | resolved conflicts for merge of a976bddd to master | Ying Wang | 2013-04-09 | 3 | -4/+6 |
|\ \ \ | |/ / | |||||
| * | | Add liblog | Ying Wang | 2013-04-09 | 3 | -4/+6 |
* | | | resolved conflicts for merge of 21dffd5d to master | Jeff Brown | 2013-04-08 | 3 | -23/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge "Queues, queues, queues and input." into jb-mr2-dev | Jeff Brown | 2013-04-08 | 3 | -23/+10 |
| |\ \ | |||||
| | * | | Queues, queues, queues and input. | Jeff Brown | 2013-04-08 | 3 | -23/+10 |
* | | | | am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permissi... | Nick Kralevich | 2013-04-04 | 1 | -0/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "aapt: add support for optional uses-permission" into jb-mr2-dev | Nick Kralevich | 2013-04-05 | 1 | -0/+8 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | aapt: add support for optional uses-permission | Nick Kralevich | 2013-04-03 | 1 | -0/+8 |
* | | | | resolved conflicts for merge of 5856ee4b to master | Brian Colonna | 2013-04-02 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | FUL now restarts when flipping tablet 180 (bug 7484464) | Brian Colonna | 2013-03-29 | 1 | -0/+4 |
| |/ / | |||||
* | | | am 483ac9a7: am b404ecc9: Merge "Fix build." into jb-mr2-dev | Dianne Hackborn | 2013-03-26 | 1 | -0/+21 |
|\ \ \ | |/ / | |||||
| * | | Fix build. | Dianne Hackborn | 2013-03-26 | 1 | -0/+21 |
* | | | Update layoutlib to latest interface. | Craig Mautner | 2013-03-18 | 1 | -2/+2 |
* | | | am 892e0782: am ad4a174b: Merge "Fix build." into jb-mr2-dev | Dianne Hackborn | 2013-03-05 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | Fix build. | Dianne Hackborn | 2013-03-05 | 1 | -0/+7 |
| * | | Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev | Craig Mautner | 2013-02-26 | 1 | -0/+18 |
| |\ \ |/ / / | |||||
| * | | Revert ActivityManager changes for tasks. DO NOT MERGE | Craig Mautner | 2013-02-25 | 1 | -0/+18 |
* | | | Fix typo. | Dianne Hackborn | 2013-02-25 | 1 | -1/+1 |
|/ / | |||||
* | | Formalize overscan metrics. | Dianne Hackborn | 2013-02-22 | 2 | -2/+2 |
* | | am ec6156f9: Merge "Fix the build." | Jim Miller | 2013-02-20 | 1 | -0/+8 |
|\ \ | |||||
| * | | Fix the build. | Jim Miller | 2013-02-20 | 1 | -0/+8 |
* | | | am ee973c27: Fix build. | Dianne Hackborn | 2013-02-19 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Fix build. | Dianne Hackborn | 2013-02-19 | 1 | -0/+6 |
* | | | am 7c93839d: Revert "Tentative fix for aidl import issue" | Laurent Tu | 2013-02-15 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Revert "Tentative fix for aidl import issue" | Laurent Tu | 2013-02-15 | 1 | -1/+1 |