1. fcf9ab5 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master by Yasuhiro Matsuda · 10 years ago
  2. ebf9465 resolved conflicts for merge of ef57e5e0 to stage-aosp-master by Yasuhiro Matsuda · 10 years ago
  3. ef57e5e Merge "Add trace code to system server." by Yasuhiro Matsuda · 10 years ago
  4. 082fb1d am 96343073: am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" by Christopher Wiley · 10 years ago
  5. 9634307 am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" by Christopher Wiley · 10 years ago
  6. dd80a6c Merge "aidl: Stop using Bionic's test main" by Christopher Wiley · 10 years ago
  7. 1006bfe aidl: Stop using Bionic's test main by Christopher Wiley · 10 years ago
  8. 59b41c6 am c8e4af65: am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" by Christopher Wiley · 10 years ago
  9. c8e4af6 am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" by Christopher Wiley · 10 years ago
  10. 722bf5c Merge "aidl: Separate aidl logic into its own static library" by Christopher Wiley · 10 years ago
  11. f3d846d am cf471647: am 267cb88f: Merge "Set up aidl for gtest" by Christopher Wiley · 10 years ago
  12. cf47164 am 267cb88f: Merge "Set up aidl for gtest" by Christopher Wiley · 10 years ago
  13. a25d351 aidl: Separate aidl logic into its own static library by Christopher Wiley · 10 years ago
  14. 267cb88 Merge "Set up aidl for gtest" by Christopher Wiley · 10 years ago
  15. 1293b95 am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." by Nick Kralevich · 10 years ago
  16. 5fa874a am 26627d70: am 4d6cb77a: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  17. 83533a2 am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 10 years ago
  18. 135fdcc am a6d16725: am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" by Christopher Wiley · 10 years ago
  19. f9d07403 am f7ea7c7b: am 1643e97b: Merge "aidl: Pull main() into dedicated file" by Christopher Wiley · 10 years ago
  20. fead6f0 am 72b1324c: am 2b83384f: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  21. 712205b am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." by Nick Kralevich · 10 years ago
  22. 26627d7 am 4d6cb77a: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  23. 13786e2 am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 10 years ago
  24. a6d1672 am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" by Christopher Wiley · 10 years ago
  25. f7ea7c7 am 1643e97b: Merge "aidl: Pull main() into dedicated file" by Christopher Wiley · 10 years ago
  26. 72b1324 am 2b83384f: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  27. 9d58692 Merge "Automatically assign default seinfo labels using the string "default"." by Nick Kralevich · 10 years ago
  28. 5e16bc5 Automatically assign default seinfo labels using the string "default". by Robert Craig · 10 years ago
  29. eaed831 am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev by Zhentao Sun · 10 years ago
  30. 53c5dad am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets by Jorim Jaggi · 10 years ago
  31. 0a24799 am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev by Zhentao Sun · 10 years ago
  32. d302508 am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets by Jorim Jaggi · 10 years ago
  33. aa06c80 am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev by Zhentao Sun · 10 years ago
  34. 4a306fd am 3a464785: Add a private API to get notified about lockout resets by Jorim Jaggi · 10 years ago
  35. 7dd5179 am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev by Christopher Ferris · 10 years ago
  36. 363c694 Merge "Don't launch the camera if it already in foreground." into mnc-dr-dev by Zhentao Sun · 10 years ago
  37. 3a46478 Add a private API to get notified about lockout resets by Jorim Jaggi · 10 years ago
  38. d6597cb am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev by Christopher Ferris · 10 years ago
  39. 1bc7d0c am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev by Christopher Ferris · 10 years ago
  40. 70c958c Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev by Christopher Ferris · 10 years ago
  41. a8a7954 Save/restore errno in SIGCHLD handler. by Christopher Ferris · 10 years ago
  42. dde3fd6 am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev by Todd Kennedy · 10 years ago
  43. aaa722a am 9030daba: am 2d7df3ef: am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  44. 3dc5895 am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  45. f7bf24a am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev by Todd Kennedy · 10 years ago
  46. 9030dab am 2d7df3ef: am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  47. f86894c am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  48. 9fe274d am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev by Todd Kennedy · 10 years ago
  49. 2d7df3e am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  50. a42870f am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  51. 9e25e16 am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev by Todd Kennedy · 10 years ago
  52. d66d4d1 am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  53. 188a33c am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  54. e7078e1 Merge "Ensure host is set before onInflate()" into mnc-dev by Todd Kennedy · 10 years ago
  55. 627975f am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  56. 7b7a3e7 am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  57. 74890df am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  58. 0bafa33 am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  59. 3cb7e91 am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  60. 35c1eb9 am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  61. 199c74e Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev by Bart Sears · 10 years ago
  62. fa6f549 am 603cfdce: am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev by Tyler Gunn · 10 years ago
  63. 82b70db [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. by Tao Bao · 10 years ago
  64. 603cfdc am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev by Tyler Gunn · 10 years ago
  65. 6a9baca am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev by Tyler Gunn · 10 years ago
  66. 0aa69b7 Ensure host is set before onInflate() by Todd Kennedy · 10 years ago
  67. 7878eee Merge "Rename carrier config constant." into mnc-dr-dev by Tyler Gunn · 10 years ago
  68. 4d6cb77 Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  69. 7f5128f am 406b60ac: am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev by Selim Cinek · 10 years ago
  70. 5b88363 Tighten up compiler flags for aidl by Christopher Wiley · 10 years ago
  71. 406b60a am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev by Selim Cinek · 10 years ago
  72. e803c9e am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev by Adrian Roos · 10 years ago
  73. 937b097 am aaebdd7f: am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev by Bart Sears · 10 years ago
  74. b8645fa am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev by Selim Cinek · 10 years ago
  75. 9cb060d am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev by Adrian Roos · 10 years ago
  76. aaebdd7 am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev by Bart Sears · 10 years ago
  77. a7cad8e Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev by Selim Cinek · 10 years ago
  78. 15d5283 am b63db9fd: am 3bd58233: am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev by Tyler Gunn · 10 years ago
  79. 7e1775d am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev by Adrian Roos · 10 years ago
  80. 02be931 am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev by Bart Sears · 10 years ago
  81. 6ef57c3 Rename carrier config constant. by Tyler Gunn · 10 years ago
  82. b63db9f am 3bd58233: am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev by Tyler Gunn · 10 years ago
  83. 7819531 Merge "Disable fingerprint after force lock" into mnc-dr-dev by Adrian Roos · 10 years ago
  84. 06fb3b2 am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev by Bart Sears · 10 years ago
  85. 3bd5823 am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev by Tyler Gunn · 10 years ago
  86. 0e2e858 Merge "Don't throttle "while idle" alarms while not dozing" into mnc-dev by Bart Sears · 10 years ago
  87. d833cb5 Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev by Tyler Gunn · 10 years ago
  88. f7ce28f am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev by Adam Lesinski · 10 years ago
  89. 60dd5d5 Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 10 years ago
  90. d0ce1fb am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev by Adam Lesinski · 10 years ago
  91. 69e17f5 am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev by Adam Lesinski · 10 years ago
  92. a73e004 Merge "Revert "Tighten up compiler flags for aidl"" by Christopher Wiley · 10 years ago
  93. ecaf21c3 Revert "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  94. da43a3a Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev by Adam Lesinski · 10 years ago
  95. 1643e97 Merge "aidl: Pull main() into dedicated file" by Christopher Wiley · 10 years ago
  96. 2f77417 aidl: Pull main() into dedicated file by Christopher Wiley · 10 years ago
  97. 2b83384 Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 10 years ago
  98. 3007cc3 am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev by Svetoslav Ganov · 10 years ago
  99. 387ce2f Add carrier config for allowing non-emerg calls in ECM mode. by Tyler Gunn · 10 years ago
  100. d1c6dca am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev by Svetoslav Ganov · 10 years ago