]> git.saurik.com Git - android/aapt.git/history - ResourceTable.h
Merge remote-tracking branch 'goog/ics-aah-exp' into merge
[android/aapt.git] / ResourceTable.h
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-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-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  Dianne Hackbornam 84affb8a: Add xxhdpi; fix ActivityManager.getLaunche...
2012-02-13  Ramanan Rajeswaranam 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE...
2012-02-13  Dianne Hackbornam d1f88de2: am c1496d2d: Add xxhdpi; fix ActivityManag...
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-01-31  Dianne Hackbornaapt now sorts the strings in the resource string pool.
2011-10-16  Dianne HackbornNew aapt feature to do smarter filtering of configurations.
2011-09-27  Eric FischerDon't lose product variant strings that also vary betwe...
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-20  Xavier Ducrohetresolved conflicts for merge of 2c311be7 to honeycomb...
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-06-10  Dianne Hackbornresolved conflicts for merge of f51ded0f to master
2011-06-09  Dianne Hackbornam a8d7ea06: am 220cd77d: Merge "Enforce public resourc...
2011-06-09  Dianne HackbornEnforce public resource restriction on bag parents.
2011-04-27  Conley OwensIgnore xml change since file no longer exists
2011-04-12  Kenny Rootresolved conflicts for merge of 87b3c0dc to honeycomb...
2011-02-28  Xavier Ducrohetam ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add ...
2011-01-30  Dianne Hackbornam a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize...
2011-01-29  Dianne Hackbornam e802b592: am 2107757d: am bbb5a5ce: Merge "Make...
2011-01-25  Dianne Hackbornam 1240719a: am bcf2adeb: Merge "aapt: Allow raw "...
2010-12-14  Dan Morrillam 0ccc8b73: am 5441a9ff: Merge "GL texture filtering...
2010-11-24  Kenny RootAdd knowledge of mipmap to aapt
2010-11-23  Kenny RootAdd knowledge of mipmap to aapt
2010-03-10  Kenny RootRevert "Dedupe resource config pointers"
2010-03-10  Kenny RootDedupe resource config pointers
2010-03-10  Dianne HackbornAdd ability for some manifest attributes to reference...
2010-02-13  Xavier Ducrohetam ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto...
2010-02-13  Xavier Ducrohetam 2be56ccb: Merge "Add --auto-add-overlay option to...
2010-02-13  Xavier DucrohetAdd --auto-add-overlay option to aapt. DO NOT MERGE
2010-02-09  Xavier DucrohetMerge "Add --auto-add-overlay option to aapt."
2010-02-05  The Android Open... am 0af04493: am 31bfdf69: reconcile main tree with...
2010-02-05  Xavier DucrohetAdd --auto-add-overlay option to aapt.
2010-01-27  Ying Wangam 6efe03b1: am 6f9e2c64: Merge "Find layout classes...
2010-01-22  Ying Wangam 3c05f1fb: am b5fb50a1: Merge "Add instrumentation...
2010-01-13  Ying Wangam b4f41119: am a1d08886: Merge "Only output proguard...
2010-01-07  Dianne Hackbornam ce56857e: am cb2d50d0: Fix issue #2357259: aapt...
2009-12-15  Android Git AutomergerMerge commit 'goog/eclair-plus-aosp'
2009-12-11  Jean-Baptiste Queruresolved conflicts for merge of ce307f88 to eclair-mr2
2009-12-09  Kenny Rootam e6c0e993: Merge change I129483f8 into eclair-mr2
2009-12-07  Kenny RootOptional use of UTF-8 strings in resource bundles
2009-11-15  Jean-Baptiste Querumerge from eclair
2009-11-13  Jean-Baptiste Querueclair snapshot
2009-10-28  Jean-Baptiste Querumerge from open-source master
2009-10-28  Jean-Baptiste Querumerge from open-source master
2009-09-04  Jean-Baptiste Querumerge from open-source master
2009-09-01  Jean-Baptiste Querumerge from open-source master
2009-08-31  Jean-Baptiste Queruam 57f03f0b: Merge snapshot version of donut back into...
2009-08-18  Suchi Amalapurapuam 75c49842: Add maxSdkVersion information in dump...
2009-08-13  Dianne HackbornAllow overlays to add resources.
2009-07-26  Jean-Baptiste QueruMerge korg/donut into korg/master
2009-07-21  Jean-Baptiste Querudonut snapshot
2009-07-16  Jean-Baptiste Querumerge-ignore changes that were already in or that are...
2009-06-10  Android (Google... am 684a2edb: Merge change 3577 into donut
2009-06-10  Android (Google... Merge change 3577 into donut
2009-06-09  Robert GreenwaltMake aapt Error out when an overlay adds a string.
2009-06-06  Robert Greenwaltam 1aa8170e: Add per-named-item overlay ability in...
2009-06-05  Robert GreenwaltAdd per-named-item overlay ability in res xml.
2009-05-20  Jean-Baptiste Querureconcile donut snapshot
2009-05-16  Dianne HackbornImplement compatibility support for WRITE_SDCARD permis...
2009-05-16  Dianne HackbornImplement compatibility support for WRITE_SDCARD permis...
2009-04-15  The Android Open... Merge commit 'korg/cupcake'
2009-04-08  Robert GreenwaltAI 144950: Manual integration of 144342 and 144547...
2009-04-03  Robert GreenwaltMerge branch 'readonly-p4-master'
2009-04-03  Robert GreenwaltAI 144413: am: CL 144342 Fix bag (string-array,etc...
2009-04-02  Robert GreenwaltAI 144342: Fix bag (string-array,etc) behavior with...
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2009-01-16  android-build Shar... Merge branch 'cupcake'
2009-01-16  The Android Open... auto import from //branches/cupcake/...@126645
2008-12-19  Jean-Baptiste QueruMerge commit 'remotes/korg/cupcake'
2008-12-18  The Android Open... Code drop from //branches/cupcake/...@124589
2008-10-21  The Android Open... Initial Contribution