Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 84be06e4ce0778fbf0c1ac72f94795ef8433439b
  1. 84be06e resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp by Xavier Ducrohet · 13 years ago
  2. a125c93 resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp by Xavier Ducrohet · 13 years ago
  3. ea9e6d2 am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 13 years ago
  4. b582af3 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 13 years ago
  5. 0bc12a0 Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 13 years ago
  6. 2c311be am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 13 years ago
  7. 3082449 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 13 years ago
  8. 8a39da8 Added Caching for PreProcessed PNGs by Josiah Gaskin · 13 years ago
  9. 1e24ccb Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 13 years ago
  10. 57aebc6 am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE by Wink Saville · 13 years ago
  11. 5abddc7 am bf361b59: Return IMEI SV if CDMA-LTE mode is used by Kazuhiro Ondo · 13 years ago
  12. f679d4c Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE by Wink Saville · 13 years ago
  13. bf361b5 Return IMEI SV if CDMA-LTE mode is used by Kazuhiro Ondo · 13 years ago
  14. 3bed4c9 Fix FeatureUser leak in ConnectivityService by Kazuhiro Ondo · 13 years ago
  15. 9139868 am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 13 years ago
  16. bf31250 am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 13 years ago
  17. ba6c98d am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 13 years ago
  18. d5431ed am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 13 years ago
  19. 82943ec am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 13 years ago
  20. 2e659ae am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 13 years ago
  21. d40c93f Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 13 years ago
  22. 4275515 Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 13 years ago
  23. 6e8c7dd am cd4636ec: Add LteOnCdmaDevice system property. by Wink Saville · 13 years ago
  24. e5143d6 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  25. a4aef41 am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  26. a74774f am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  27. 4d8f6a3 Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  28. 03589cc Add generation of dependency file for .ap_ package by Josiah Gaskin · 13 years ago
  29. 3ab6ccd am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  30. b32af64 am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  31. d4dee1a am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  32. b7f0d82 am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  33. 2acddc5 am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  34. 3114059 am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  35. 29fd8cd am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  36. 691257b am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  37. 89bac18 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  38. 16db83c am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  39. 80ef174 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  40. 68e37da am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  41. 8840991 Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  42. eb07c53 Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  43. c06c360 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  44. 55f115a Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  45. f139965 am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  46. 45ddd42 am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  47. 3edba93 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  48. 98fcc40 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  49. cd4636e Add LteOnCdmaDevice system property. by Wink Saville · 13 years ago
  50. fc00b2e am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 13 years ago
  51. e163519 am 476f5525: Small fix to 5008973 fix. by Robert Greenwalt · 13 years ago
  52. 8550f3b resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp by Robert Greenwalt · 13 years ago
  53. 476f552 Small fix to 5008973 fix. by Robert Greenwalt · 13 years ago
  54. 0a46db5 Apply the dns and route diff which we get a change by Robert Greenwalt · 13 years ago
  55. 74c425d3 am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE by John Wang · 13 years ago
  56. 54b2a32 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE by John Wang · 13 years ago
  57. 98c3fcc Show SIM blocked after 10 time puk wrong entries. by John Wang · 13 years ago
  58. 1bce9e2 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 13 years ago
  59. 3810361 am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE by Wink Saville · 13 years ago
  60. 6d1d16c Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE by Wink Saville · 13 years ago
  61. e822225 Remove STOPSHIP but allow seamless Handoff when possible. by Wink Saville · 13 years ago
  62. 6dd4531 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp by Jaikumar Ganesh · 13 years ago
  63. ab3ec17 am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 13 years ago
  64. 9ff8949 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 13 years ago
  65. 28d92af am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE by John Wang · 13 years ago
  66. 2ac78a2 Merge "Add getImei() to Phone interface." into honeycomb-LTE by John Wang · 13 years ago
  67. 53cf785 Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 13 years ago
  68. 2ea7e44 Add getImei() to Phone interface. by John Wang · 13 years ago
  69. 0814a9a am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  70. 9b446cd am bc047bb0: am e32c49ab: docs: de-new sidenavs by Scott Main · 13 years ago
  71. bc047bb am e32c49ab: docs: de-new sidenavs by Scott Main · 13 years ago
  72. 4e40015 am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a by Robert Ly · 13 years ago
  73. 1e4cf2d am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a by Robert Ly · 13 years ago
  74. e32c49a docs: de-new sidenavs by Scott Main · 13 years ago
  75. 10a3602 cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a by Robert Ly · 13 years ago
  76. db4c5f3 resolved conflicts for merge of 7816eded to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  77. 22f4e8f am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard by Scott Main · 13 years ago
  78. 56a085c am d3fa7bd1: docs: fix date on opengl dashboard by Scott Main · 13 years ago
  79. d3fa7bd docs: fix date on opengl dashboard by Scott Main · 13 years ago
  80. 9163a4a am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. by Xavier Ducrohet · 13 years ago
  81. aa4b1d8 am d292d2a0: Merge 36a3a392 from mr1. by Xavier Ducrohet · 13 years ago
  82. d292d2a Merge 36a3a392 from mr1. by Xavier Ducrohet · 13 years ago
  83. 01588ac Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 13 years ago
  84. 3b219a5 am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE by Chia-chi Yeh · 13 years ago
  85. 4821d3b Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE by Chia-chi Yeh · 13 years ago
  86. 0ddd996 am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE by Wink Saville · 13 years ago
  87. 12b91ed Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE by Wink Saville · 13 years ago
  88. e5d891e Add a property so that CSIM provision check can be bypassed by Kazuhiro Ondo · 13 years ago
  89. a9e00a4 am 89799e72: Fix incorrect ERI banner format by Kazuhiro Ondo · 13 years ago
  90. 89799e7 Fix incorrect ERI banner format by Kazuhiro Ondo · 13 years ago
  91. 99cd667 am 64ba5eaa: Concurrent multi-PDP support in TrafficStats by Kazuhiro Ondo · 13 years ago
  92. 64ba5ea Concurrent multi-PDP support in TrafficStats by Kazuhiro Ondo · 13 years ago
  93. 15bc894 Preserve invariant that sService is not null (although NfcAdapter.get() can return null) by Robert Tsai · 13 years ago
  94. 6a4610a VpnService: stop VPN when unknown DNS servers show up. by Chia-chi Yeh · 13 years ago
  95. d9f9142 am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 by Robert Ly · 13 years ago
  96. f84bb99 am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 by Joe Malin · 13 years ago
  97. d1c15f9 am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 by Joe Fernandez · 13 years ago
  98. 6b98e71 am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 by Robert Ly · 13 years ago
  99. 3f3b8cb Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 by Robert Ly · 13 years ago
  100. 3ef341c am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE by Wink Saville · 13 years ago