Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / cba06c2272c8bce7d10b2a7ee762d12043f3252a
  1. cba06c2 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  2. 6ba4c9d am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 by Adam Lesinski · 11 years ago
  3. c78b33d Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 by Adam Lesinski · 11 years ago
  4. 8108bf6 am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 by Eric Laurent · 11 years ago
  5. 6957369 Merge "Frameworks/base: Wall Werror in media/jni" by Andreas Gampe · 11 years ago
  6. be593a7 Merge "split-select: fix OSX build" into lmp-mr1-dev by Adam Lesinski · 11 years ago
  7. 390854c am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca" by Andreas Gampe · 11 years ago
  8. 5a15d0d Frameworks/base: Wall Werror in media/jni by Andreas Gampe · 11 years ago
  9. 7188903 am ce23ecff: Merge "Frameworks/base: Wall Werror in native/graphics" by Andreas Gampe · 11 years ago
  10. 37fcecd am 827909fc: Merge "Frameworks/base: Wall Werror in drm" by Andreas Gampe · 11 years ago
  11. 6a7ceb5 am e7368705: Merge "Frameworks/base: Wall Werror in native/android" by Andreas Gampe · 11 years ago
  12. b45d3b2 am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 by Eric Laurent · 11 years ago
  13. 4b7b557 am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c by Eric Laurent · 11 years ago
  14. da98fbc am 1521303f: Merge "kill OS_CASE_SENSITIVE" by Yabin Cui · 11 years ago
  15. 538b00f Merge "Frameworks/base: Wall Werror in media/mca" by Andreas Gampe · 11 years ago
  16. ce23ecf Merge "Frameworks/base: Wall Werror in native/graphics" by Andreas Gampe · 11 years ago
  17. 827909f Merge "Frameworks/base: Wall Werror in drm" by Andreas Gampe · 11 years ago
  18. e736870 Merge "Frameworks/base: Wall Werror in native/android" by Andreas Gampe · 11 years ago
  19. e5160e7 Frameworks/base: Wall Werror in media/mca by Andreas Gampe · 11 years ago
  20. ad64557 am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c by Eric Laurent · 11 years ago
  21. c3344e8 split-select: fix OSX build by Adam Lesinski · 11 years ago
  22. 75c306d am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d by Eric Laurent · 11 years ago
  23. 318365e Frameworks/base: Wall Werror in drm by Andreas Gampe · 11 years ago
  24. cad87d7 Frameworks/base: Wall Werror in native/graphics by Andreas Gampe · 11 years ago
  25. 1521303 Merge "kill OS_CASE_SENSITIVE" by Yabin Cui · 11 years ago
  26. 95ef0ac am 525da301: am 85d558cd: Add Activity API to get referrer information. by Dianne Hackborn · 11 years ago
  27. d2361f2f Frameworks/base: Wall Werror in native/android by Andreas Gampe · 11 years ago
  28. 525da30 am 85d558cd: Add Activity API to get referrer information. by Dianne Hackborn · 11 years ago
  29. 85d558c Add Activity API to get referrer information. by Dianne Hackborn · 11 years ago
  30. 8c95fb8 am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev by Alan Viverette · 11 years ago
  31. 99aced3 am b782ccd8: am 85a5f23b: am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  32. a0bac64 am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev by George Mount · 11 years ago
  33. 9e0ed1c am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  34. e7a89f5 am a3131862: Merge "kill HAVE_INOTIFY" by Yabin Cui · 11 years ago
  35. a313186 Merge "kill HAVE_INOTIFY" by Yabin Cui · 11 years ago
  36. fb8e2b1 kill OS_CASE_SENSITIVE by Yabin Cui · 11 years ago
  37. 89f48e6 am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  38. c2aa0e1 am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev by Jorim Jaggi · 11 years ago
  39. 15f7b37 am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev by Adrian Roos · 11 years ago
  40. e991fac am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs by Dirk Dougherty · 11 years ago
  41. 20a9cf4 kill HAVE_INOTIFY by Yabin Cui · 11 years ago
  42. 40681e2 am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev by Justin Harrison · 11 years ago
  43. e1362d1 am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev by Alan Viverette · 11 years ago
  44. b782ccd am 85a5f23b: am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  45. fb5877a am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe by Deepanshu Gupta · 11 years ago
  46. 7cc11f8 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 by Deepanshu Gupta · 11 years ago
  47. 9713d74 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 by Deepanshu Gupta · 11 years ago
  48. 993e3d2 Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev by Alan Viverette · 11 years ago
  49. 2fe4961 am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev by George Mount · 11 years ago
  50. 85a5f23 am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  51. 19c1cbd Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev by George Mount · 11 years ago
  52. ca7c01c am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  53. 3011e1b am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  54. 8db769d am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  55. df878bd am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  56. ced2f74 am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  57. e8c1a97 am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  58. cab3443 am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  59. 3b92fc0 am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant by Eric Laurent · 11 years ago
  60. 465e053 am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  61. 2b0b7a6 am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  62. 3bd6035 am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  63. 8334c66 am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev by Jorim Jaggi · 11 years ago
  64. c2f2a72 Merge "docs:builds tools 21.1.1 update" into lmp-docs by Joe Fernandez · 11 years ago
  65. 12174a7 Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev by Jorim Jaggi · 11 years ago
  66. 09fc10f am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev by Adrian Roos · 11 years ago
  67. f2bd3cc Merge "Add LockSettingsStorage tests" into lmp-mr1-dev by Adrian Roos · 11 years ago
  68. b7f4218 am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c by Adrian Roos · 11 years ago
  69. 13cf9cf am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f by Evan Charlton · 11 years ago
  70. 9687153 Merge "Merge commit 'fa31eb2c' into manualmerge" into lmp-mr1-dev-plus-aosp by Adam Lesinski · 11 years ago
  71. 4d29c66 Merge commit 'fa31eb2c' into manualmerge by Adam Lesinski · 11 years ago
  72. 42e620e am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs by Dirk Dougherty · 11 years ago
  73. 57421b1 am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev by Justin Harrison · 11 years ago
  74. 4254ac0 am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs by Dirk Dougherty · 11 years ago
  75. bd0eb36 Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev by Justin Harrison · 11 years ago
  76. 19d4e78 am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER" by Yabin Cui · 11 years ago
  77. 56d190c am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs by Dirk Dougherty · 11 years ago
  78. a923530 Merge "kill HAVE_SCHED_SETSCHEDULER" by Yabin Cui · 11 years ago
  79. 1f33b2f am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 by Deepanshu Gupta · 11 years ago
  80. f253fe3 am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs by Dirk Dougherty · 11 years ago
  81. 1adeba2 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac by Deepanshu Gupta · 11 years ago
  82. 984d81c am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." by Elliott Hughes · 11 years ago
  83. aa53920 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c by Deepanshu Gupta · 11 years ago
  84. 7d3d5fe am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 by Deepanshu Gupta · 11 years ago
  85. 828db35 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac by Deepanshu Gupta · 11 years ago
  86. a09dda8 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c by Deepanshu Gupta · 11 years ago
  87. 7346a1a am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3 by John Spurlock · 11 years ago
  88. fac1b94 am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7 by Santos Cordon · 11 years ago
  89. 8953c11 am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71 by Adrian Roos · 11 years ago
  90. 050ea85 am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4 by Jorim Jaggi · 11 years ago
  91. e440493 am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068 by Alan Viverette · 11 years ago
  92. 34f24ae am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev by Dan Sandler · 11 years ago
  93. 7dc3d70 Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c by Adrian Roos · 11 years ago
  94. aea80f4 Cancel lockscreen/shade gestures when orientation changes by Jorim Jaggi · 11 years ago
  95. e542499 Add LockSettingsStorage tests by Adrian Roos · 11 years ago
  96. 4c0f0e6 Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 by Deepanshu Gupta · 11 years ago
  97. 3cf0640 Merge "Add primitive shadows support to LayoutLib" into lmp-dev by Deepanshu Gupta · 11 years ago
  98. 0e3925d Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c by Deepanshu Gupta · 11 years ago
  99. 2ff3ba5 Use fonts for smaller languages of South and Southeast Asia. by Roozbeh Pournader · 11 years ago
  100. e6ef98c Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev by Adrian Roos · 11 years ago