1. 83c1a98 Merge "Camera3: don't let dequeueBuffer block indefinitely" am: bbf70c5122 by Eino-Ville Talvala · 9 years ago
  2. 3c24231 Merge "Camera3: don't let dequeueBuffer block indefinitely" am: bbf70c5122 by Eino-Ville Talvala · 9 years ago
  3. bbf70c5 Merge "Camera3: don't let dequeueBuffer block indefinitely" by Eino-Ville Talvala · 9 years ago
  4. f81b009 Camera3: don't let dequeueBuffer block indefinitely by Zhijun He · 9 years ago
  5. 205a224 Merge "Silence warning about unused variables in BRILLO." am: bcd87f5969 by Alex Deymo · 9 years ago
  6. ca59abe Merge "Silence warning about unused variables in BRILLO." am: bcd87f5969 by Alex Deymo · 9 years ago
  7. bcd87f5 Merge "Silence warning about unused variables in BRILLO." by Alex Deymo · 9 years ago
  8. eb4c32d Silence warning about unused variables in BRILLO. by Alex Deymo · 9 years ago
  9. 50859c3 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 am: 6f8e939c58 -s ours am: f49ac6ef61 am: 5d7ca78437 am: 3662106826 am: f225daf883 -s ours by Robert Shih · 9 years ago
  10. f3f9578 DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d -s ours am: b83d53d49a am: 015c71c8fd am: 4748e19a97 am: 9ac28e62e6 -s ours by Robert Shih · 9 years ago
  11. 05593ed Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f am: 21c660a129 am: 231bf612d8 by Robert Shih · 9 years ago
  12. 168e164 resolve merge conflicts of 77da968 to nyc-dev-plus-aosp by Robert Shih · 9 years ago
  13. 67fd8ff Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 am: 6f8e939c58 -s ours am: f49ac6ef61 am: 5d7ca78437 am: 3662106826 by Robert Shih · 9 years ago
  14. bae02c1 DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d -s ours am: b83d53d49a am: 015c71c8fd am: 4748e19a97 by Robert Shih · 9 years ago
  15. f225daf Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 am: 6f8e939c58 -s ours am: f49ac6ef61 am: 5d7ca78437 by Robert Shih · 9 years ago
  16. 9ac28e6 DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d -s ours am: b83d53d49a am: 015c71c8fd by Robert Shih · 9 years ago
  17. 3662106 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 am: 6f8e939c58 -s ours am: f49ac6ef61 by Robert Shih · 9 years ago
  18. 4748e19 DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d -s ours am: b83d53d49a by Robert Shih · 9 years ago
  19. 5d7ca78 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 am: 6f8e939c58 -s ours by Robert Shih · 9 years ago
  20. 015c71c DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 am: 47932efd3d -s ours by Robert Shih · 9 years ago
  21. 919a5ab Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f am: 21c660a129 by Robert Shih · 9 years ago
  22. 77da968 MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 am: 51efd24460 am: 8d32201d4a am: 2b5ee9c8e4 by Robert Shih · 9 years ago
  23. f49ac6e Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 am: 82bc8c4511 by Robert Shih · 9 years ago
  24. b83d53d DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 am: d6e7dcbb64 by Robert Shih · 9 years ago
  25. 6f8e939 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours am: a9c1e43d89 by Robert Shih · 9 years ago
  26. 47932ef DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours am: 081388d875 by Robert Shih · 9 years ago
  27. 231bf61 Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 am: 71b72fc26f by Robert Shih · 9 years ago
  28. 17744ab MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 am: 51efd24460 am: 8d32201d4a by Robert Shih · 9 years ago
  29. 82bc8c4 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours am: 91ec9a6fd3 -s ours by Robert Shih · 9 years ago
  30. d6e7dcb DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours am: 08eab78209 -s ours by Robert Shih · 9 years ago
  31. 21c660a Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc am: 6a93a9e982 by Robert Shih · 9 years ago
  32. 2b5ee9c MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 am: 51efd24460 by Robert Shih · 9 years ago
  33. 71b72fc Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 am: 730c25e0dc by Robert Shih · 9 years ago
  34. a9c1e43 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231 -s ours by Robert Shih · 9 years ago
  35. 081388d DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b -s ours by Robert Shih · 9 years ago
  36. 8d32201 MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 by Robert Shih · 9 years ago
  37. 6a93a9e Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 am: e13b8f2d61 by Robert Shih · 9 years ago
  38. 91ec9a6 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 by Robert Shih · 9 years ago
  39. 08eab78 DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 by Robert Shih · 9 years ago
  40. 51efd24 MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 by Robert Shih · 9 years ago
  41. 730c25e Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d am: 21cc1102b4 by Robert Shih · 9 years ago
  42. 7fa7052 Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 by Robert Shih · 9 years ago
  43. d560830 MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c by Robert Shih · 9 years ago
  44. 48b3aca DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 by Robert Shih · 9 years ago
  45. e13b8f2 Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d by Robert Shih · 9 years ago
  46. b07255f MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c by Robert Shih · 9 years ago
  47. 21cc110 Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev by Robert Shih · 9 years ago
  48. 24b2dba Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev by Robert Shih · 9 years ago
  49. 2cee1de DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 by Robert Shih · 9 years ago
  50. 7b6a855 MediaPlayerService: avoid invalid static cast am: ee0a0e39ac by Robert Shih · 9 years ago
  51. 4fb531e Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev by Robert Shih · 9 years ago
  52. e35213d Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev by Robert Shih · 9 years ago
  53. 776229a Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd am: 6b1403777e am: be78a1c73f am: 3879515987 am: d4808afb99 am: 143a184a65 by Andy Hung · 9 years ago
  54. bfe53d4 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c am: c4d991b2ae am: 4f1a678f8c am: 31ab14bef7 am: 1e98e388cb am: c4a59671b7 by Eric Laurent · 9 years ago
  55. 167bfc2 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd am: 6b1403777e am: be78a1c73f am: 3879515987 am: d4808afb99 by Andy Hung · 9 years ago
  56. 6369681 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c am: c4d991b2ae am: 4f1a678f8c am: 31ab14bef7 am: 1e98e388cb by Eric Laurent · 9 years ago
  57. 143a184 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd am: 6b1403777e am: be78a1c73f am: 3879515987 by Andy Hung · 9 years ago
  58. c4a5967 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c am: c4d991b2ae am: 4f1a678f8c am: 31ab14bef7 by Eric Laurent · 9 years ago
  59. d4808af Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd am: 6b1403777e am: be78a1c73f by Andy Hung · 9 years ago
  60. 1e98e38 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c am: c4d991b2ae am: 4f1a678f8c by Eric Laurent · 9 years ago
  61. 3879515 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd am: 6b1403777e by Andy Hung · 9 years ago
  62. 31ab14b soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c am: c4d991b2ae by Eric Laurent · 9 years ago
  63. be78a1c Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 am: c3476feccd by Andy Hung · 9 years ago
  64. 4f1a678 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 am: 6aa5165f7c by Eric Laurent · 9 years ago
  65. 6b14037 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 am: d959102420 by Andy Hung · 9 years ago
  66. c4d991b soundtrigger: add size check on sound model and recogntion data am: ef0c915184 am: 82477c0929 by Eric Laurent · 9 years ago
  67. c3476fe Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am: 36e11a4c23 by Andy Hung · 9 years ago
  68. 6aa5165 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 by Eric Laurent · 9 years ago
  69. d959102 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev by Andy Hung · 9 years ago
  70. 82477c0 soundtrigger: add size check on sound model and recogntion data am: ef0c915184 by Eric Laurent · 9 years ago
  71. 36e11a4 Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev by Andy Hung · 9 years ago
  72. cdb1ca4 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba am: 2596457b6f am: 8665ad8cb9 am: 927c482bfe am: 175863bdfd am: 89d94bfe99 by Andy Hung · 9 years ago
  73. a3e0e40 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be am: 1ab50af9c1 am: 18e5ce6891 am: 0330f4ce2d am: 41880fe252 am: 7b2ce5639f by Andy Hung · 9 years ago
  74. e638b6d Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba am: 2596457b6f am: 8665ad8cb9 am: 927c482bfe am: 175863bdfd by Andy Hung · 9 years ago
  75. 4faee5a Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be am: 1ab50af9c1 am: 18e5ce6891 am: 0330f4ce2d am: 41880fe252 by Andy Hung · 9 years ago
  76. 89d94bf Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba am: 2596457b6f am: 8665ad8cb9 am: 927c482bfe by Andy Hung · 9 years ago
  77. 7b2ce56 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be am: 1ab50af9c1 am: 18e5ce6891 am: 0330f4ce2d by Andy Hung · 9 years ago
  78. 175863b Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba am: 2596457b6f am: 8665ad8cb9 by Andy Hung · 9 years ago
  79. 41880fe Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be am: 1ab50af9c1 am: 18e5ce6891 by Andy Hung · 9 years ago
  80. 927c482 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba am: 2596457b6f by Andy Hung · 9 years ago
  81. 0330f4c Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be am: 1ab50af9c1 by Andy Hung · 9 years ago
  82. 8665ad8 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed am: 2e16ed2fba by Andy Hung · 9 years ago
  83. 18e5ce6 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e am: 00acbf03be by Andy Hung · 9 years ago
  84. 2596457 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 am: 34334a97ed by Andy Hung · 9 years ago
  85. 1ab50af Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 am: ced0dd635e by Andy Hung · 9 years ago
  86. 2e16ed2 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 am: 6cc3c2dc98 by Andy Hung · 9 years ago
  87. 00acbf0 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e am: d37cf46848 by Andy Hung · 9 years ago
  88. 34334a9 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41 by Andy Hung · 9 years ago
  89. ced0dd6 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e by Andy Hung · 9 years ago
  90. 6cc3c2d Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac by Andy Hung · 9 years ago
  91. d37cf46 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 by Andy Hung · 9 years ago
  92. 53657ba Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 by Andy Hung · 9 years ago
  93. ebd9f10 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 by Andy Hung · 9 years ago
  94. 1929443 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 by Andy Hung · 9 years ago
  95. 19d8a61 Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 by Andy Hung · 9 years ago
  96. 9665548 Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev by Andy Hung · 9 years ago
  97. beafd1c DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234 am: 484d229a3c am: 2c4162e822 am: ab3d5af8d2 -s ours by Pawin Vongmasa · 9 years ago
  98. 7e82258 DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234 am: 484d229a3c am: 2c4162e822 by Pawin Vongmasa · 9 years ago
  99. ab3d5af DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234 am: 484d229a3c by Pawin Vongmasa · 9 years ago
  100. 2c4162e DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff -s ours am: 83cf293b73 -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec -s ours am: 1dd4973234 by Pawin Vongmasa · 9 years ago