]> git.saurik.com Git - android/aapt.git/history - AaptAssets.cpp
am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
[android/aapt.git] / AaptAssets.cpp
2012-05-01  Jean-Baptiste Queruresolved conflicts for merge of 13c04786 to jb-dev...
2012-05-01  Jean-Baptiste Queruresolved conflicts for merge of bc2fb7b9 to jb-dev...
2012-03-22  Mike LockwoodMerge remote-tracking branch 'goog/ics-aah-exp' into...
2012-03-07  Ramanan Rajeswaranam 4ec961d5: (-s ours) DO NOT MERGE
2012-03-07  Dianne Hackbornam b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager...
2012-03-07  Ramanan Rajeswaranam 5e7bb1e6: (-s ours) DO NOT MERGE
2012-03-07  Dianne Hackbornam e6a0ec60: (-s ours) Add xxhdpi; fix ActivityManager...
2012-03-05  Ramanan RajeswaranDO NOT MERGE
2012-03-05  Dianne HackbornAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSiz...
2012-03-05  Ramanan RajeswaranDO NOT MERGE
2012-03-05  Dianne HackbornAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSiz...
2012-02-24  Xavier Ducrohetam 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move...
2012-02-24  inazarukam 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix...
2012-02-24  Xavier Ducrohetam 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move...
2012-02-24  inazarukam 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix...
2012-02-24  Xavier Ducrohetam 816b873d: Move the automatic namespace outside of...
2012-02-24  inazarukam eed8d0b3: Fix for issue 9656 - custom xml attributes...
2012-02-23  Jean-Baptiste Queruam 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5...
2012-02-23  Jean-Baptiste QueruMerge "Fix for issue 9656 - custom xml attributes in...
2012-02-14  Ramanan Rajeswaranam 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics...
2012-02-13  Ramanan RajeswaranDO NOT MERGE
2012-02-13  Dianne Hackbornam 84affb8a: Add xxhdpi; fix ActivityManager.getLaunche...
2012-02-13  Dianne HackbornAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSiz...
2012-02-13  Ramanan Rajeswaranam 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE...
2012-02-13  Ramanan Rajeswaranam 8046e294: Merge "DO NOT MERGE" into ics-scoop
2012-02-13  Ramanan RajeswaranDO NOT MERGE
2012-02-13  Dianne Hackbornam d1f88de2: am c1496d2d: Add xxhdpi; fix ActivityManag...
2012-02-13  Dianne Hackbornam c1496d2d: Add xxhdpi; fix ActivityManager.getLaunche...
2012-02-13  Dianne HackbornAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSiz...
2012-02-07  Dianne HackbornOnly generate private symbols that are needed.
2012-02-06  Xavier Ducrohetam 9485ca87: am b54f371c: am f8aea993: Make aapt ignore...
2012-02-06  Xavier Ducrohetam 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore...
2012-02-06  Xavier Ducrohetam f8aea993: Make aapt ignore tools-related data.
2012-01-25  Dianne HackbornAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSiz...
2012-01-21  Jean-Baptiste Queruam 45470559: (-s ours) am 12b7da69: am 6df477be: Merge...
2012-01-21  Jean-Baptiste Queruam db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge...
2012-01-21  Jean-Baptiste Queruam dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge...
2012-01-21  Jean-Baptiste Queruam a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge...
2012-01-21  Jean-Baptiste Queruam d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc
2011-12-16  Joe OnoratoAdd a new ui mode for "appliance"
2011-12-15  Joe OnoratoAdd a new ui mode for "appliance"
2011-10-16  Dianne HackbornWhoops, remove left-over debug output.
2011-10-16  Dianne HackbornNew aapt feature to do smarter filtering of configurations.
2011-08-18  Xavier Ducrohetam f4750724: am 9d829f98: am 21e6e2de: Merge "Change...
2011-07-28  Xavier Ducrohetam 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove...
2011-07-21  Xavier Ducrohetam 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to...
2011-07-21  Xavier Ducrohetresolved conflicts for merge of ea9e6d24 to honeycomb...
2011-07-21  Xavier Ducrohetam a125c937: resolved conflicts for merge of 2c311be7...
2011-07-20  Xavier Ducrohetresolved conflicts for merge of 2c311be7 to honeycomb...
2011-07-19  Xavier Ducrohetam 9139868b: am ba6c98db: am 82943ecf: am d40c93f6...
2011-07-19  Xavier Ducrohetam ba6c98db: am 82943ecf: am d40c93f6: Merge "Add depen...
2011-07-19  Xavier Ducrohetam d5431ed5: am 2e659ae5: am 42755155: Merge "Copy...
2011-07-18  Josiah GaskinAdd generation of dependency file for .ap_ package
2011-06-27  Josiah GaskinAdd dependency generation to Aapt for R.java
2011-06-02  Dianne Hackbornresolved conflicts for merge of 54cb63e2 to master
2011-05-27  Dianne Hackbornam 528c49f1: am b96cbbd1: Add "tv" density for 720p...
2011-05-27  Dianne HackbornAdd "tv" density for 720p screens.
2011-05-24  Dianne Hackbornresolved conflicts for merge of bbca8133 to master
2011-05-23  Dianne Hackbornam 4bb78889: am 40277df7: Merge "Add "television" mode...
2011-05-23  Dianne HackbornAdd "television" mode.
2011-05-20  The Android Open... Reconcile with honeycomb-release
2011-05-20  Dianne Hackbornresolved conflicts for merge of 06a8ceac to master
2011-05-20  Dianne Hackbornam c851ea56: am 69cb8757: Add new "-swNNNdp" resource...
2011-05-20  Dianne HackbornAdd new "-swNNNdp" resource qualifier.
2011-05-13  Dianne Hackbornam 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integra...
2011-05-13  Dianne HackbornDO NOT MERGE. Integrate add new screen width/height...
2011-04-27  Conley Owensam eedf20c2: Ignore xml change since file no longer...
2011-04-12  Kenny Rootresolved conflicts for merge of 18490fb9 to master
2011-04-06  Dianne HackbornAdd new resource configurations for screen width/height...
2011-01-30  Dianne HackbornMerge "Normalize output from aapt d"
2011-01-29  Dianne Hackbornam e802b592: am 2107757d: am bbb5a5ce: Merge "Make...
2011-01-29  Dianne Hackbornam 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry...
2011-01-29  Dianne HackbornMerge "Make AaptGroupEntry::getMncName accept mnc00"
2011-01-04  Johan RedestigMake AaptGroupEntry::getMncName accept mnc00
2010-11-05  Jean-Baptiste Queruam 5580e44c: Merge "Support changing style parent in...
2010-09-10  Xavier Ducrohetam 89fef418: Merge "Avoid pre-processing images when...
2010-09-02  Jean-Baptiste Queruresolved conflicts for merge of bd6abed3 to gingerbread...
2010-08-13  Ying WangMerge "Output proguard keep flags for fragment classes...
2010-08-13  Eric FischerMerge "Change aapt's warning message to suggest formatt...
2010-08-13  Ficus Kirkpatrickam 2abde6e0: Add --max-res-version flag to aapt.
2010-08-13  Ficus KirkpatrickAdd --max-res-version flag to aapt.
2010-08-13  Ficus Kirkpatrickam 7525c2cf: Merge "Add --max-res-version flag to aapt...
2010-08-13  Ficus KirkpatrickAdd --max-res-version flag to aapt.
2010-08-13  Ficus KirkpatrickAdd --max-res-version flag to aapt.
2010-08-11  Jean-Baptiste Queruam e37ab632: Merge "Fix build on some linux machines"
2010-06-29  The Android Open... set up fast-forward from froyo-release to gingerbread
2010-06-17  Dan Morrillam 6b22d81a: As Donut (API=4) devices and earlier do...
2010-06-15  Joe Onoratoam 9d71860e: Merge "The aapt and aidl tools are prebuil...
2010-06-06  Dianne Hackbornam fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi...
2010-06-06  Dianne Hackbornam 5474902f: Merge "xhdpi" into froyo
2010-06-04  Dianne Hackbornxhdpi
2010-05-04  Dan Morrillam f7ebcfec: am e17b4e71: Merge "Adding the backward...
2010-04-28  Dianne Hackbornam 14cee9f6: New xlarge screen size.
2010-04-28  Dianne HackbornNew xlarge screen size.
2010-03-05  Ed HeylMerge "Change an aapt "warning" from "*** " to "**...
2010-03-05  Xavier DucrohetMerge "Fix potential aapt crash when processing overlay."
2010-03-05  Dianne HackbornRefactor car mode.
2010-03-02  Dianne HackbornFix issue #2448075: aapt doesn't fix up activity-alias...
2010-02-19  Kenny RootUse direct reference to enum in AaptAssets
2010-02-18  Kenny RootMerge "Change buf size holding integer in ResourceTable"
next