1. 685d363 Merge commit 'fb96e54' into manualmerge by Adam Lesinski · 10 years ago
  2. 69ecfa9 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  3. c953898 Fix issues that occurred due to building with clang by Adam Lesinski · 10 years ago
  4. 8a5bb15 Fix automerge issue by Adam Lesinski · 10 years ago
  5. b2808c0 Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp by Adam Lesinski · 10 years ago
  6. b490d5d am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001 by Deepanshu Gupta · 10 years ago
  7. 9549824 am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae by Deepanshu Gupta · 10 years ago
  8. 837e65b am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 by Deepanshu Gupta · 10 years ago
  9. 0cc963c Fix build due to bad merge by Adam Lesinski · 10 years ago
  10. 4dfff4e am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  11. 3fd3400 Merge commit '78be0498' into manualmerge by Adam Lesinski · 10 years ago
  12. fef5001 am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 by Deepanshu Gupta · 10 years ago
  13. 9a6d8ae am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a by Deepanshu Gupta · 10 years ago
  14. 5ad0763 am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed by Deepanshu Gupta · 10 years ago
  15. 0a2e42d Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 by Deepanshu Gupta · 10 years ago
  16. 33996b9 Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a by Deepanshu Gupta · 10 years ago
  17. cd5f3ba Merge "Use the right layout for inflating Action Bar." into lmp-dev by Deepanshu Gupta · 10 years ago
  18. de7de47 Add error checking to aapt for split generation by Adam Lesinski · 10 years ago
  19. f7ffcaa Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  20. 668f0a3 Merge "Fix issues that will be present in C++11" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  21. 9b64954 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev by Deepanshu Gupta · 10 years ago
  22. c23487a Merge "Support framework menus in ActionBar" into lmp-dev by Deepanshu Gupta · 10 years ago
  23. 84a89ed Merge "Use the right layout for inflating Action Bar." into lmp-dev by Deepanshu Gupta · 10 years ago
  24. c3dc0b5 Build the split-select tool without C++11 support by Adam Lesinski · 10 years ago
  25. 4bf5810 Fix issues that will be present in C++11 by Adam Lesinski · 10 years ago
  26. 5177979 am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e by Jeff Brown · 10 years ago
  27. 0ed053e am e333e674: Add a function to boost screen brightness temporarily. by Jeff Brown · 10 years ago
  28. e333e67 Add a function to boost screen brightness temporarily. by Jeff Brown · 10 years ago
  29. 6a80527 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev by Craig Mautner · 10 years ago
  30. 9f4979b am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. by Deepanshu Gupta · 10 years ago
  31. a9f20a2 am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev by Deepanshu Gupta · 10 years ago
  32. b9bbccc am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev by Deepanshu Gupta · 10 years ago
  33. 73b1b5a am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev by Deepanshu Gupta · 10 years ago
  34. 159da3d Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev by Craig Mautner · 10 years ago
  35. 9c79504 Add enter-animation-done callback for system windows by Craig Mautner · 10 years ago
  36. 9fa48b0 Fix BridgeContext.get*ResourceValue() by Deepanshu Gupta · 10 years ago
  37. df0ebab Support framework menus in ActionBar by Deepanshu Gupta · 10 years ago
  38. 0bffc73 Use the right layout for inflating Action Bar. by Deepanshu Gupta · 10 years ago
  39. 5456230 am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. by Deepanshu Gupta · 10 years ago
  40. bf59e89 am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev by Deepanshu Gupta · 10 years ago
  41. 122ccfb am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev by Deepanshu Gupta · 10 years ago
  42. 62cf56c am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev by Deepanshu Gupta · 10 years ago
  43. 617e809 Add missing delegate for AnimatorInflater. by Deepanshu Gupta · 10 years ago
  44. 75bf1b1 Merge "Skip loading animations." into lmp-dev by Deepanshu Gupta · 10 years ago
  45. c55eb17 Merge "Fix multiple styles case in resource resolution." into lmp-dev by Deepanshu Gupta · 10 years ago
  46. 92a5214 Merge "Use right theme for drawable inflation." into lmp-dev by Deepanshu Gupta · 10 years ago
  47. 0b42936 Skip loading animations. by Deepanshu Gupta · 10 years ago
  48. b6444c4 Fix multiple styles case in resource resolution. by Deepanshu Gupta · 10 years ago
  49. 4a605c6 Use right theme for drawable inflation. by Deepanshu Gupta · 10 years ago
  50. a9aecc0 Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 by Tim Kilbourn · 10 years ago
  51. d9b1cad aapt updates for Android TV by Tim Kilbourn · 10 years ago
  52. 08d1c80 Merge commit 'cd8442d4' into manualmerge by Adam Lesinski · 10 years ago
  53. 2bf9253 Merge "First commit of split-select tool" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  54. 40e8eef First commit of split-select tool by Adam Lesinski · 10 years ago
  55. c719872 am 22387d9d: am 01c80f15: am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c by Deepanshu Gupta · 10 years ago
  56. 01c80f1 am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c by Deepanshu Gupta · 10 years ago
  57. 568f16c Merge "Check Bridge init before disposing." into lmp-dev by Deepanshu Gupta · 10 years ago
  58. 11d3d10 am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." by Dan Albert · 10 years ago
  59. 9295a13 am e40974d9: Merge "Fix an overflow found by ASAN." by Dan Albert · 10 years ago
  60. d395f79 Fix an overflow found by ASAN. by Dan Albert · 10 years ago
  61. 217b17a am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev by Adam Lesinski · 10 years ago
  62. 6dfe03a am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev by Adam Lesinski · 10 years ago
  63. aff7c24 AAPT: Fix path for final generated resources on Windows by Adam Lesinski · 10 years ago
  64. b69ec77 Check Bridge init before disposing. by Deepanshu Gupta · 10 years ago
  65. 10db755 am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev by Adam Lesinski · 10 years ago
  66. effd416 am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev by Adam Lesinski · 10 years ago
  67. 9306a47 AAPT: Fix an issue where a resource name was incorrectly derived on Windows by Adam Lesinski · 10 years ago
  68. 7dd8731 am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  69. 9086562 Minor resource notation/compatibility fixes by Adam Lesinski · 10 years ago
  70. b51644c am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev by Jerome Dochez · 10 years ago
  71. 0757e5f am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev by Jerome Dochez · 10 years ago
  72. f47f885 Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev by Jerome Dochez · 10 years ago
  73. 7c5020d am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. by Deepanshu Gupta · 10 years ago
  74. b913af5 Track change to private libcore data structure. by Elliott Hughes · 10 years ago
  75. 90e01b3 am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." by Elliott Hughes · 10 years ago
  76. b68fe9e am ae1b6805: Merge "Track change to private libcore data structure." by Elliott Hughes · 10 years ago
  77. d47acae Track change to private libcore data structure. by Elliott Hughes · 10 years ago
  78. 908a4f9 am 4f133894: Exclude KXmlParser from LayoutLib. by Deepanshu Gupta · 10 years ago
  79. 4f13389 Exclude KXmlParser from LayoutLib. by Deepanshu Gupta · 10 years ago
  80. 11b14e3 LayoutLib: Use ICU's line break algo. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  81. 5787920 am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev by Adam Lesinski · 10 years ago
  82. a80aba7 Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev by Adam Lesinski · 10 years ago
  83. f15de2e AAPT: Gate v21 resource synthesizing logging behind -v flag by Adam Lesinski · 10 years ago
  84. fe54f8a am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev by Deepanshu Gupta · 10 years ago
  85. c74a2b3 Merge "Minor style changes." into lmp-dev by Deepanshu Gupta · 10 years ago
  86. 6f1280c Added a daemon mode to aapt to receive streams of commands from gradle. by Jerome Dochez · 10 years ago
  87. 3c8140a Minor style changes. by Deepanshu Gupta · 10 years ago
  88. e4ef95b am 2e67a882: am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev by Deepanshu Gupta · 10 years ago
  89. c2a0b44 resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp by Neil Fuller · 10 years ago
  90. f08384c7 am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev by Stephen Hines · 10 years ago
  91. 5e77475 am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" by Andreas Gampe · 10 years ago
  92. ee66515 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" by Neil Fuller · 10 years ago
  93. 0c1faf4 Merge "Switch from FloatMath -> Math and Math.hypot where possible" by Neil Fuller · 10 years ago
  94. 152d9aa am 31629651: Merge "Frameworks/base: Fix more aapt issues" by Andreas Gampe · 10 years ago
  95. 87332a7 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  96. b8dc7bc Frameworks/base: Fix more aapt issues by Andreas Gampe · 10 years ago
  97. 7b13c4d Merge "Always resolve enum when resolving resources." into lmp-dev by Deepanshu Gupta · 10 years ago
  98. 1dcc75b am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings" by Andreas Gampe · 10 years ago
  99. 2412f84 Frameworks/base: Fix AAPT warnings by Andreas Gampe · 10 years ago
  100. 47c23a2 resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp by Dan Albert · 10 years ago