]> git.saurik.com Git - android/aapt.git/history - SourcePos.cpp
resolved conflicts for merge of ce307f88 to eclair-mr2
[android/aapt.git] / SourcePos.cpp
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-04  Jean-Baptiste Querumerge from open-source master
2009-07-30  Jean-Baptiste Queruam f4dc9da3: Merge snapshot variant of donut back into...
2009-07-26  Jean-Baptiste Querureconcile korg/master into goog/master
2009-07-22  Android (Google... am 9fc20b0e: Merge change 8126 into donut
2009-07-21  Jean-Baptiste Queruam db7db69a: Merge snapshot variant of donut back into...
2009-07-20  Android (Google... am aad0fcc9: Merge change 7783 into donut
2009-07-16  Jean-Baptiste Querumerge-ignore changes that were already in or that are...
2009-07-13  Marco NelissenFormat aapt warnings the same way as other compiler...
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2008-10-21  The Android Open... Initial Contribution