| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aosp | Raphael Moll | 2012-06-14 | 3 | -11/+846 | |
| | |\ \ \ | ||||||
| | | * \ \ | am 0f160c95: Merge "Layoutlib Create: Find dependencies." | Raphael Moll | 2012-06-14 | 4 | -52/+790 | |
| | | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | | * | | Layoutlib Create: Find dependencies. | Raphael Moll | 2012-06-13 | 4 | -52/+790 | |
| * | | | | | am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" i... | Dianne Hackborn | 2012-06-12 | 1 | -1/+3 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev | Dianne Hackborn | 2012-06-12 | 1 | -1/+3 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Fix issue #6641368: can't launch gallery | Dianne Hackborn | 2012-06-11 | 1 | -1/+3 | |
| | * | | | | am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt bui... | Jean-Baptiste Queru | 2012-06-05 | 1 | -0/+4 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | | am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac O... | Jean-Baptiste Queru | 2012-06-05 | 1 | -0/+4 | |
| | | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | | * | | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6. | Ying Wang | 2012-06-05 | 1 | -0/+4 | |
| * | | | | | Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." | Ying Wang | 2012-06-05 | 1 | -0/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6. | Ying Wang | 2012-05-31 | 1 | -0/+4 | |
| * | | | | | | am 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path" | Tor Norbye | 2012-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | | am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path" | Tor Norbye | 2012-06-05 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | | am 36ac43ba: Merge "Tweak default ignore-assets path" | Tor Norbye | 2012-06-05 | 1 | -1/+1 | |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | * | | | Tweak default ignore-assets path | Tor Norbye | 2012-06-04 | 1 | -1/+1 | |
| | | * | | | | am 0748a569: Merge "aapt: Remove terminal pointer incrementaion" | Jean-Baptiste Queru | 2012-06-02 | 1 | -1/+0 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | Merge "aapt: Remove terminal pointer incrementaion" | Jean-Baptiste Queru | 2012-06-02 | 1 | -1/+0 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | aapt: Remove terminal pointer incrementaion | Nobuhiro Hayashi | 2012-03-30 | 1 | -1/+0 | |
| | | | * | | | | Merge "Fix length of pattern." DO NOT MERGE. | Ying Wang | 2012-05-24 | 1 | -0/+1 | |
| | | |/ / / / | ||||||
| * | | | | | | am fcd73824: am dd251cab: Merge "Fix build." into jb-dev | Dianne Hackborn | 2012-06-04 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | ||||||
| | * | | | | am dd251cab: Merge "Fix build." into jb-dev | Dianne Hackborn | 2012-06-04 | 1 | -2/+2 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Fix build. | Dianne Hackborn | 2012-06-04 | 1 | -2/+2 | |
| * | | | | | am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition ... | Dianne Hackborn | 2012-05-29 | 1 | -0/+5 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retri... | Dianne Hackborn | 2012-05-29 | 1 | -0/+5 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Fix (mostly) issue #5109947: Race condition between retrieving a... | Dianne Hackborn | 2012-05-29 | 1 | -0/+5 | |
| * | | | | | am 9d98a089: Check result handler is not null | Manuel Roman | 2012-05-23 | 1 | -1/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Check result handler is not null | Manuel Roman | 2012-05-23 | 1 | -1/+4 | |
| | * | | | | | am 44e63a21: Support rendering layout that use the new res-auto namespace. | Xavier Ducrohet | 2012-02-24 | 2 | -3/+13 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | am 5786f5cf: Merge "Fix build." into ics-mr1 | Dianne Hackborn | 2012-02-24 | 1 | -5/+8 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | am 816b873d: Move the automatic namespace outside of the res namespace. do no... | Xavier Ducrohet | 2012-02-23 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries.... | inazaruk | 2012-02-23 | 1 | -3/+9 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 | Xavier Ducrohet | 2012-02-22 | 2 | -19/+176 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it.... | Xavier Ducrohet | 2012-02-06 | 4 | -21/+57 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | am f8aea993: Make aapt ignore tools-related data. | Xavier Ducrohet | 2012-02-06 | 1 | -31/+46 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into... | Jim Miller | 2012-01-18 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" in... | Jason Simmons | 2012-01-11 | 1 | -0/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes | Jason Simmons | 2011-12-16 | 1 | -0/+15 | |
| | * | | | | | | | | | | | | | | Merge "Modified the constructor of EndpointBase" into ics-aah | Manuel Roman | 2012-01-04 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Modified the constructor of EndpointBase | Manuel Roman | 2012-01-03 | 1 | -1/+5 | |
| | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Add a new ui mode for "appliance" | Joe Onorato | 2011-12-14 | 1 | -0/+5 | |
| | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge "The com.android.athome api classes are moving android.support.place." ... | Joe Onorato | 2011-12-12 | 2 | -10/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | The com.android.athome api classes are moving android.support.place. | Joe Onorato | 2011-12-11 | 2 | -10/+10 | |
| | * | | | | | | | | | | | | | | am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merg... | Raphael | 2011-12-12 | 2 | -5/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Use the new get/putFlattenable methods on RpcData. | Joe Onorato | 2011-12-04 | 1 | -36/+5 | |
| | * | | | | | | | | | | | | | | am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming bac... | Dianne Hackborn | 2011-11-28 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Don't try to unmarshal void return types when there are out parameters being ... | Joe Onorato | 2011-11-17 | 1 | -5/+7 | |
| | * | | | | | | | | | | | | | | | For events, require that the parameters be marked in. | Joe Onorato | 2011-11-08 | 1 | -0/+9 | |
| | * | | | | | | | | | | | | | | | Support putting Flattenables in Lists. | Joe Onorato | 2011-11-07 | 2 | -5/+34 | |
| | * | | | | | | | | | | | | | | | Was generating code that uses the wrong RpcData. | Joe Onorato | 2011-11-06 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | Merge "This should fix the build for now." into ics-aah | Joe Onorato | 2011-11-03 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : frameworks_base.git | |
| frameworks base |
| summaryrefslogtreecommitdiffstats |