Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / 20ec4fa2294a91e5ff87839280904aba4a050cf6
  1. 20ec4fa resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp by Dan Albert · 12 years ago
  2. ddb605d am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." by Dan Albert · 12 years ago
  3. 6080394 resolved conflicts for merge of 00fe3544 to lmp-dev-plus-aosp by Dan Albert · 12 years ago
  4. 8bdebdd resolved conflicts for merge of d7f604af to lmp-dev-plus-aosp by Andreas Gampe · 12 years ago
  5. 6c58575 am 2ffa4aab: Merge "Use char16_t for char things." by Dan Albert · 12 years ago
  6. 2ffa4aa Merge "Use char16_t for char things." by Dan Albert · 12 years ago
  7. de86cf1 am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." by Dan Albert · 12 years ago
  8. 5a6934c Merge "Don't pollute the namespace for two uses." by Dan Albert · 12 years ago
  9. 00fe354 am 294ce05e: Merge "Make string literal concatenation play nice with C++11." by Dan Albert · 12 years ago
  10. 294ce05 Merge "Make string literal concatenation play nice with C++11." by Dan Albert · 12 years ago
  11. 1c6c757 Don't pollute the namespace for two uses. by Dan Albert · 12 years ago
  12. be23d47 Make string literal concatenation play nice with C++11. by Dan Albert · 12 years ago
  13. f348c15 Use char16_t for char things. by Dan Albert · 12 years ago
  14. 0ff86c7 am cd74e05a: Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev by Andreas Gampe · 12 years ago
  15. 968051a am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev by Deepanshu Gupta · 12 years ago
  16. 6c39b72 am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev by Deepanshu Gupta · 12 years ago
  17. 9668f59 am 5728a78a: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev by Deepanshu Gupta · 12 years ago
  18. f43f04e Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev by Andreas Gampe · 12 years ago
  19. d8891f9 am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev by Deepanshu Gupta · 12 years ago
  20. dd2e505 am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev by Deepanshu Gupta · 12 years ago
  21. 10b4670 am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev by Deepanshu Gupta · 12 years ago
  22. 8d29a06 Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev by Deepanshu Gupta · 12 years ago
  23. 93b828d Merge "Add layoutlib tests to DIST_DIR" into lmp-dev by Deepanshu Gupta · 12 years ago
  24. fa4e214 Merge "Remove warning for null entries in resource array." into lmp-dev by Deepanshu Gupta · 12 years ago
  25. a9306fa am cb8e4490: am f73b4f5e: am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  26. 8aef3c0 am 11fb85ef: am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev by Michael Wright · 12 years ago
  27. e079148 am f73b4f5e: am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  28. d4241d4 am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev by Michael Wright · 12 years ago
  29. 0238fff am 0dc5409c: am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev by Wink Saville · 12 years ago
  30. 7b56bc9 am 9b507f23: am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev by Amit Mahajan · 12 years ago
  31. 4a96554 am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  32. b62bb77 Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev by Michael Wright · 12 years ago
  33. 78606e5 am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev by Wink Saville · 12 years ago
  34. 35fe84d am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev by Amit Mahajan · 12 years ago
  35. c79c44a am 37999f4a: am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev by Amit Mahajan · 12 years ago
  36. edc121c am 63fe87ff: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev by Chris Craik · 12 years ago
  37. 40e9f39 Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev by Wink Saville · 12 years ago
  38. d87e048 am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  39. 3afd6e3 Add FEATURE_GAMEPAD to current.txt by Michael Wright · 12 years ago
  40. 4009b98 Merge "Assisted dialing support of MO SMS" into lmp-dev by Amit Mahajan · 12 years ago
  41. 57490eb am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev by Amit Mahajan · 12 years ago
  42. f3e2a0b am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev by Chris Craik · 12 years ago
  43. 604ae4c am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  44. 8a4537b Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into lmp-dev by Amit Mahajan · 12 years ago
  45. 96b3e61 Change getCurrentPhoneType to SystemApi by Wink Saville · 12 years ago
  46. 2286f81 Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-dev by Chris Craik · 12 years ago
  47. db960ad change the property name about IDP from 'telephony.' to 'gsm.' by Steven Liu · 12 years ago
  48. 552e5ce Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs by Dirk Dougherty · 12 years ago
  49. 8a226d2 Don't track TextureLayer lifecycles in RenderState by Chris Craik · 12 years ago
  50. 6371ab6 am 61e1d7da: am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev by Sreeram Ramachandran · 12 years ago
  51. 0c35a2c am 5d37962d: am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev by Michael Wright · 12 years ago
  52. 58da181 am 36bbc399: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev by Michael Wright · 12 years ago
  53. 4912049 am f07575ae: am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev by Michael Wright · 12 years ago
  54. d7b6de2 am 3026f1b7: am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev by Michael Wright · 12 years ago
  55. 465ef3b am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev by Sreeram Ramachandran · 12 years ago
  56. c90d040 am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev by Michael Wright · 12 years ago
  57. 76e374f am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev by Michael Wright · 12 years ago
  58. e7df34e Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev by Sreeram Ramachandran · 12 years ago
  59. 984ec01 am 6d92c31d: am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev by Ihab Awad · 12 years ago
  60. 7cc1a39 am 5ef20e85: am 8414b3b9: am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  61. f615926 Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev by Michael Wright · 12 years ago
  62. 8e3b4d4 Merge "Add FEATURE_GAMEPAD." into lmp-dev by Michael Wright · 12 years ago
  63. 56156c4 am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev by Michael Wright · 12 years ago
  64. 20fe1f9 am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev by Michael Wright · 12 years ago
  65. 68f9269 Merge "Allow wake keys to wake dozing device." into lmp-dev by Michael Wright · 12 years ago
  66. 58d90c1 Merge "Remove unused variables from UsbHostManager." into lmp-dev by Michael Wright · 12 years ago
  67. 30f608d am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev by Ihab Awad · 12 years ago
  68. 549f4d9 am 8414b3b9: am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  69. 993fbe1 am cb39e887: am 8fd9c6eb: am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  70. 18e721f am 24214d37: am a24ba624: am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html by David Friedman · 12 years ago
  71. 1bfa0f2 am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev by RoboErik · 12 years ago
  72. 6faa675 Add FEATURE_GAMEPAD. by Michael Wright · 12 years ago
  73. 9802f0d Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev by Ihab Awad · 12 years ago
  74. 2618a52 am 8fd9c6eb: am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  75. 4b211ea am a24ba624: am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html by David Friedman · 12 years ago
  76. 35e41c1 am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev by RoboErik · 12 years ago
  77. 73f41d9 am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  78. 718803f am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  79. cf0a6c1 am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  80. 52fd418 am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html by David Friedman · 12 years ago
  81. c4c7c9d am 62645748: am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev by Tsuwei Chen · 12 years ago
  82. aa19f1f am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  83. 4f60f81 Merge "Possible fix for dead handler in Music button event sending" into lmp-dev by RoboErik · 12 years ago
  84. b5a21ad Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" by Robert Ly · 12 years ago
  85. 60874f9 am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev by Tsuwei Chen · 12 years ago
  86. f5e56d4 Remove unused variables from UsbHostManager. by Michael Wright · 12 years ago
  87. 7eabd92 am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  88. a4c038a am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html by David Friedman · 12 years ago
  89. ff4f6c8 Merge "Manually merge QC's change for SUPL_ES." into lmp-dev by Tsuwei Chen · 12 years ago
  90. 3207948 am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  91. 7e8786d am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html by David Friedman · 12 years ago
  92. f8cc0fd am 76abca06: am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev by Andrew Lee · 12 years ago
  93. b8bf169 am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev by Yorke Lee · 12 years ago
  94. a64627c Enable (@hidden) video connection support for RemoteConnections by Ihab Awad · 12 years ago
  95. 4186379 Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" by David Friedman · 12 years ago
  96. 0637aab am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev by Andrew Lee · 12 years ago
  97. 63543a2b am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev by Yorke Lee · 12 years ago
  98. 8c766fe Update IntelliJ project file for IntelliJ 14 by Deepanshu Gupta · 12 years ago
  99. be5b656 Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev by Andrew Lee · 12 years ago
  100. 478f5a6 Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev by Yorke Lee · 12 years ago