1. 56996ff resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 by Chih-Hung Hsieh · 8 years ago
  2. ef57a0d resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 by Chih-Hung Hsieh · 8 years ago
  3. ed935c3 resolve merge conflicts of 76ce8e5 to stage-aosp-master by Chih-Hung Hsieh · 8 years ago
  4. 76ce8e5 Merge "Fix clang-tidy warnings in libs/hwui." by Treehugger Robot · 8 years ago
  5. 8bd37ba Fix clang-tidy warnings in aapt and aapt2. by Chih-Hung Hsieh · 8 years ago
  6. 9b8528f Fix clang-tidy warnings in aapt and aapt2. by Chih-Hung Hsieh · 8 years ago
  7. 17874c9 Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96 am: a33407d2f8 by Hans Boehm · 8 years ago
  8. 53511e1 Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96 by Hans Boehm · 8 years ago
  9. a33407d Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 by Hans Boehm · 8 years ago
  10. c97c9db Merge "Do not stack allocate RefBase object in AaptAssets::filter" by Hans Boehm · 8 years ago
  11. 25dfa75 Do not stack allocate RefBase object in AaptAssets::filter by Hans Boehm · 8 years ago
  12. f35c939 Fix clang-tidy warnings in libs/hwui. by Chih-Hung Hsieh · 8 years ago
  13. 4979645 Fix clang-tidy warnings in libs/hwui. by Chih-Hung Hsieh · 8 years ago
  14. 4c93815 AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938 by Adam Lesinski · 8 years ago
  15. 8487775 AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938 by Adam Lesinski · 8 years ago
  16. e69f9ca AAPT: Fix feature split generation of ID resources am: 4d219da3c4 by Adam Lesinski · 8 years ago
  17. 59a91c0 Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  18. 4d219da AAPT: Fix feature split generation of ID resources by Adam Lesinski · 8 years ago
  19. 7297957 AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a am: 76cbcd495e by Adam Lesinski · 8 years ago
  20. 12e5b87 AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a by Adam Lesinski · 8 years ago
  21. ca955a4 AAPT: faketouch feature implied if no touchscreen feature requested. by Adam Lesinski · 8 years ago
  22. f580d91 Aapt main dex proguard rules - always keep application by Ivan Gavrilovic · 8 years ago
  23. 1a7d992 Merge \\"AAPT: Don\\'t keep processing files that failed to be added\\" into nyc-mr1-dev am: d94f55552f by Adam Lesinski · 8 years ago
  24. 28250b6 Merge \"AAPT: Don\'t keep processing files that failed to be added\" into nyc-mr1-dev by Adam Lesinski · 8 years ago
  25. 526d73b AAPT: Don't keep processing files that failed to be added by Adam Lesinski · 8 years ago
  26. 6feeeab Add bound checks to utf16_to_utf8 am: 1deedbacc3 by Sergio Giro · 8 years ago
  27. 1deedba Add bound checks to utf16_to_utf8 by Sergio Giro · 8 years ago
  28. 10de3af1 AAPT: Improve debuggability of aapt dump badging errors by Adam Lesinski · 8 years ago
  29. fb5cfc3 Merge \\"Add bound checks to utf16_to_utf8\\" into nyc-mr1-dev am: 49c410bc48 by Sergio Giro · 8 years ago
  30. daad138 Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev am: 49c410bc48 by Sergio Giro · 8 years ago
  31. 49c410b Merge "Add bound checks to utf16_to_utf8" into nyc-mr1-dev by Sergio Giro · 8 years ago
  32. 4781057 Add bound checks to utf16_to_utf8 by Sergio Giro · 8 years ago
  33. f69d514 Merge \\"Don\\'t match locales with different scripts in ResourceFilter\\" into nyc-mr1-dev am: 9d2a3188fa by Roozbeh Pournader · 8 years ago
  34. 8a24cfb Merge \"Don\'t match locales with different scripts in ResourceFilter\" into nyc-mr1-dev by Roozbeh Pournader · 8 years ago
  35. 3f32c27 Don't match locales with different scripts in ResourceFilter by Roozbeh Pournader · 8 years ago
  36. 1ec2fd7 stephenli@ manually merge many commits up to '032dcff' by The Android Automerger · 8 years ago
  37. d5bb848 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 by Adam Lesinski · 8 years ago
  38. e819d01 Fix misc-macro-parentheses warnings in aapt and androidfw. by Chih-Hung Hsieh · 8 years ago
  39. 0935d01 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 am: 1d10d94396 by Michael Wright · 8 years ago
  40. feaf99f Stop emitting javadoc for @removed attributes. by Michael Wright · 8 years ago
  41. d53e3be Fix google-explicit-constructor warnings. by Chih-Hung Hsieh · 8 years ago
  42. 682583c AAPT: ProGuard config for components in main dex. by Rohit Agrawal · 8 years ago
  43. 6ba873f AAPT: ProGuard config for components in main dex. by Rohit Agrawal · 8 years ago
  44. 86229cb AAPT: ProGuard config for components in main dex. by Rohit Agrawal · 8 years ago
  45. 694d0a7 AAPT: Dump uses-feature version in dump badging by Adam Lesinski · 8 years ago
  46. 6e452f9e Don't try to compress .mkv resources by Wonsik Kim · 8 years ago
  47. 08a3fa7 Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev by Andrew Johnson · 8 years ago
  48. 299e488 Removing assignments to localeScriptWasComputed in aapt. by Andrew Johnson · 8 years ago
  49. d126b1e Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev by Matt Sarett · 8 years ago
  50. 48efde4f Work-around paletted image decoding bug in SDK_JELLYBEAN by Matt Sarett · 8 years ago
  51. 7960898 Fix script-related parts of locale resource matching by Roozbeh Pournader · 8 years ago
  52. afc79be AAPT: Allow duplicate attribute definitions if identical by Adam Lesinski · 8 years ago
  53. 525db24 Revert "AAPT: Allow duplicate attribute definitions if identical" by Adam Lesinski · 8 years ago
  54. c25283b AAPT: Allow duplicate attribute definitions if identical by Adam Lesinski · 8 years ago
  55. 9e1923d AAPT: Remove warnings for public resources without comments by Adam Lesinski · 8 years ago
  56. 37a866e Merge "Encode paletted PNGs more efficiently (part 2)" by Matt Sarett · 8 years ago
  57. 33fcd11 Encode paletted PNGs more efficiently (part 2) by Matt Sarett · 8 years ago
  58. 2a84e23 Encode paletted PNGs more efficiently by Matt Sarett · 8 years ago
  59. 3c7235d Encode paletted PNGs more efficiently by Matt Sarett · 8 years ago
  60. b927c55 Implement smarter locale resource selection by Roozbeh Pournader · 8 years ago
  61. 46736ec Merge "Make the appropriate cast to protect from mingw." am: dbf8c17bd2 by Dan Albert · 8 years ago
  62. 2edfa8c Merge "Make the appropriate cast to protect from mingw." am: dbf8c17bd2 by Dan Albert · 8 years ago
  63. ed811ee Make the appropriate cast to protect from mingw. by Dan Albert · 8 years ago
  64. 3b1b68d Allow ninepatches to be encoded using non-RGBA modes by Matt Sarett · 8 years ago
  65. 087e0fc DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330 by Adam Lesinski · 8 years ago
  66. b2c5155 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 by Adam Lesinski · 8 years ago
  67. 5f3b2ec AAPT: Dump uses-permission-sdk-23 by Adam Lesinski · 8 years ago
  68. 7871399 Specify private resource package in Android.mk by Adam Lesinski · 8 years ago
  69. 43aecc8 Merge "Track rename from base/ to android-base/." am: 9f6a2ae67c am: 8aa8fe2c64 by Elliott Hughes · 8 years ago
  70. be5474d Track rename from base/ to android-base/. by Elliott Hughes · 8 years ago
  71. 90d5052 Don't try to compress .webm resources by Marco Nelissen · 9 years ago
  72. 07dfd2d Implement AAPT Bundle format by Adam Lesinski · 9 years ago
  73. 5b9847c Revert "Implement AAPT Bundle format" by Adam Lesinski · 9 years ago
  74. 9d0f7d4 Implement AAPT Bundle format by Adam Lesinski · 9 years ago
  75. b355964 Don't set modification times in aapt zip entries by Tor Norbye · 9 years ago
  76. 09ffc62 Merge "AAPT: Don't try to rewrite String constants when loading shared lib" by Adam Lesinski · 9 years ago
  77. eed5858 AAPT: Don't try to rewrite String constants when loading shared lib by Adam Lesinski · 9 years ago
  78. ab5bca1 Merge "Load app resource as shared library." by Tao Bai · 9 years ago
  79. a6d7e3f Load app resource as shared library. by Tao Bai · 9 years ago
  80. 13786e2 am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 9 years ago
  81. 4aa679f Remove USE_MINGW, whitelist windows modules by Dan Willemsen · 9 years ago
  82. 84d4917 am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." by Elliott Hughes · 9 years ago
  83. bda7780 am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." by Elliott Hughes · 9 years ago
  84. e17788c Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools. by Elliott Hughes · 9 years ago
  85. f473084 am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev by Adam Lesinski · 9 years ago
  86. 9a9fd61 am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev by Adam Lesinski · 9 years ago
  87. beb9e33 AAPT: Fix regression in resource versioning by Adam Lesinski · 9 years ago
  88. 344d347 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." by Elliott Hughes · 9 years ago
  89. 17b4be0 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." by Elliott Hughes · 9 years ago
  90. ba3fe56 Lose HAVE_ANDROID_OS from frameworks/base. by Elliott Hughes · 9 years ago
  91. a5c9d82 am 7fa83d26: am b9904daa: am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev by Adam Lesinski · 9 years ago
  92. 10730b6 am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev by Adam Lesinski · 9 years ago
  93. 0e25272 am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h." by Elliott Hughes · 9 years ago
  94. e628672 am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h." by Elliott Hughes · 9 years ago
  95. 9ec96f9 Move frameworks/base/tools/ off AndroidConfig.h. by Elliott Hughes · 9 years ago
  96. f45d2fa AAPT: Fix resource versioning by Adam Lesinski · 9 years ago
  97. a083ef9 am bbcc914b: am 01efd7e8: Merge "Use build_number from file" by Colin Cross · 9 years ago
  98. 6f1e3c5 am bbcc914b: am 01efd7e8: Merge "Use build_number from file" by Colin Cross · 9 years ago
  99. 01efd7e Merge "Use build_number from file" by Colin Cross · 9 years ago
  100. 1c6d900 am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now." by Elliott Hughes · 9 years ago