Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 2ce61fb68a598622343047aa8a202513a61566c2
  1. 2ce61fb resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 by Robert Greenwalt · 10 years ago
  2. fba515f resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce by Robert Greenwalt · 10 years ago
  3. f1530bf resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 by Robert Greenwalt · 10 years ago
  4. 3927089 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 by Robert Greenwalt · 10 years ago
  5. 1e04dfb resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 by Robert Greenwalt · 10 years ago
  6. 81674b1 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 by Robert Greenwalt · 10 years ago
  7. 2ecc918 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 by Robert Greenwalt · 10 years ago
  8. 5946a9b resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 by Robert Greenwalt · 10 years ago
  9. 5a77651 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. by Robert Greenwalt · 10 years ago
  10. 370567d Fix system watchdog timeout when reading too many usage events. am: 8877120173 by Mark Lu · 10 years ago
  11. 8877120 Fix system watchdog timeout when reading too many usage events. by Mark Lu · 10 years ago
  12. b5f6115 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d by Robert Greenwalt · 10 years ago
  13. 50843b1 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc by Robert Greenwalt · 10 years ago
  14. c99c4178 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f by Robert Greenwalt · 10 years ago
  15. 5d7bb38 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 by Robert Greenwalt · 10 years ago
  16. a652b71 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe by Robert Greenwalt · 10 years ago
  17. 064eb2a Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 by Robert Greenwalt · 10 years ago
  18. 628b8f1 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe by Robert Greenwalt · 10 years ago
  19. ef58df6 Merge "Check permissions on getDeviceId." into mnc-dr-dev by Robert Greenwalt · 10 years ago
  20. 4557ef3 Merge "Check permissions on getDeviceId." into mnc-dev by Robert Greenwalt · 10 years ago
  21. 132814f Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05 by Bryce Lee · 10 years ago
  22. 9eaa59a Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev by Bryce Lee · 10 years ago
  23. cf91b45 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev by Bryce Lee · 10 years ago
  24. 0ccc3a1 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b by Bryce Lee · 10 years ago
  25. fc3762a Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b by Bryce Lee · 10 years ago
  26. cae2f24 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev by Bryce Lee · 10 years ago
  27. 1f7a36b DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f by Adam Lesinski · 10 years ago
  28. e457fa4 Add UUID to BluetoothHeadsetClientCall by Bryce Lee · 10 years ago
  29. 7f5ad22 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 by Adam Lesinski · 10 years ago
  30. 8c92091 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 by Adam Lesinski · 10 years ago
  31. 40d1ab9 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 by Adam Lesinski · 10 years ago
  32. b2c5155 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 by Adam Lesinski · 10 years ago
  33. ec85f34 Add setting for declaring disabled bluetooth profiles. by Bryce Lee · 10 years ago
  34. 1d81716 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: d0dd157ade -s ours by Geoff Mendal · 10 years ago
  35. 86c9eb8 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8b4b230174 -s ours by Geoff Mendal · 10 years ago
  36. 4893042 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: d0dd157ade -s ours by Geoff Mendal · 10 years ago
  37. 82ce2a6 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8b4b230174 -s ours by Geoff Mendal · 10 years ago
  38. 5b1b0a8 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 10bc1c7000 -s ours by Geoff Mendal · 10 years ago
  39. d0dd157 Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  40. 8f316d2 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  41. 8b4b230 Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  42. 1144462f Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  43. c8ddc96 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 10bc1c7000 -s ours by Geoff Mendal · 10 years ago
  44. 4cab516 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: df5dd062a0 -s ours by Geoff Mendal · 10 years ago
  45. b16da9a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 531eb5b484 -s ours by Geoff Mendal · 10 years ago
  46. 10bc1c7 Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  47. 0750798 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 327d917865 -s ours by Geoff Mendal · 10 years ago
  48. e0b7426 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  49. a32b362 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: df5dd062a0 -s ours by Geoff Mendal · 10 years ago
  50. 57a89670 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 531eb5b484 -s ours by Geoff Mendal · 10 years ago
  51. b295f81 Import translations. DO NOT MERGE am: 22dea4e16f -s ours by Geoff Mendal · 10 years ago
  52. df5dd06 Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  53. 7babe8d Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 327d917865 -s ours by Geoff Mendal · 10 years ago
  54. 648fa539 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  55. 531eb5b Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  56. d8004c0 Import translations. DO NOT MERGE am: 22dea4e16f -s ours by Geoff Mendal · 10 years ago
  57. d2615bd Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  58. 327d917 Merge "Import translations. DO NOT MERGE" into cw-e-dev by Geoff Mendal · 10 years ago
  59. 695cf96 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  60. 22dea4e Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  61. d5808d0 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev by Adam Lesinski · 10 years ago
  62. 1d6d4c5 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev by Adam Lesinski · 10 years ago
  63. 5f8c818 DO NOT MERGE: Fix batterystats battery level int packing by Adam Lesinski · 10 years ago
  64. 7197bb4 Use wakeup reason when FingerPrint sensor wakes up the device am: 9289560aa0 by Adam Lesinski · 10 years ago
  65. 9289560 Use wakeup reason when FingerPrint sensor wakes up the device by Adam Lesinski · 10 years ago
  66. 4ab8b06 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 by Bryce Lee · 10 years ago
  67. 36393a5 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 by Bryce Lee · 10 years ago
  68. 4614596 Allow access to deprecated LOCK_PATTERN_ENABLED flag. by Bryce Lee · 10 years ago
  69. 911dfe8 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev by Ian Pedowitz · 10 years ago
  70. cf07154 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev by Ian Pedowitz · 10 years ago
  71. ddb52fb DO NOT MERGE Remove more extras during notification lightening. by Dan Sandler · 10 years ago
  72. d735fbb Don\'t back up / restore EAP network definitions am: a89f9d93cb by Christopher Tate · 10 years ago
  73. a89f9d9 Don't back up / restore EAP network definitions by Christopher Tate · 10 years ago
  74. 9ba6eb9 Work on issue #25467052: System lagged out am: 022c748f54 by Dianne Hackborn · 10 years ago
  75. 022c748 Work on issue #25467052: System lagged out by Dianne Hackborn · 10 years ago
  76. 4e4ff05 Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4 by Adam Lesinski · 10 years ago
  77. ba88e68 Prevent DivideByZero error in BatteryStatsImpl by Adam Lesinski · 10 years ago
  78. a83d518 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a am: 180dd72a9b by Bryce Lee · 10 years ago
  79. 180dd72 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a by Bryce Lee · 10 years ago
  80. 3c67873f Improve logging in BluetoothHeadsetClientCall. by Bryce Lee · 10 years ago
  81. 3ebd5ce Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 by Prashant Malani · 10 years ago
  82. 6344cb8 Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 by Prashant Malani · 10 years ago
  83. 487f0d3 Merge "Add rotary encoder input source" into cw-e-dev by Prashant Malani · 10 years ago
  84. e4db3f0 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d by Chenjie Luo · 10 years ago
  85. d515b12 Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev by Amit Mahajan · 10 years ago
  86. 5ff55ce Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am: dde5a6ef28 by Julia Reynolds · 10 years ago
  87. bef0525 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev by Chenjie Luo · 10 years ago
  88. e56f7b0 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev by Chenjie Luo · 10 years ago
  89. d8231b9 Check permissions on getDeviceId. by Robert Greenwalt · 10 years ago
  90. 0b63802 Check permissions on getDeviceId. by Robert Greenwalt · 10 years ago
  91. cd2cc9a Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev by Amit Mahajan · 10 years ago
  92. dde5a6e Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev by Julia Reynolds · 10 years ago
  93. 3e57340 Fix radio button flash on hour change. by Julia Reynolds · 10 years ago
  94. 5794dbb Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 by Eino-Ville Talvala · 10 years ago
  95. e2d516f Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 by Eino-Ville Talvala · 10 years ago
  96. 7417f70 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 by Eino-Ville Talvala · 10 years ago
  97. add4b91 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d by Eino-Ville Talvala · 10 years ago
  98. 9887f2f Protect some new broadcasts. by Robert Greenwalt · 10 years ago
  99. 69c5e71 Merge "Camera: codegen doc update" into mnc-dev by Eino-Ville Talvala · 10 years ago
  100. 90bc39d Check NPE beforehand instead of catching it at runtime by Chenjie Luo · 10 years ago