Gitiles
Code Review Sign In
review.evervolv.com / android_frameworks_av / 6ab6061131a10b7f38074c156fd529fa3719a32b
  1. 6ab6061 Merge "DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a am: a9cfe53698" into nyc-mr2-dev-plus-aosp by Wonsik Kim · 10 years ago
  2. 29b0600 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a am: ba2f1aa053 by Wonsik Kim · 10 years ago
  3. af02a97 Merge "codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 am: b67b0afbf5" into nyc-mr2-dev-plus-aosp by Wonsik Kim · 10 years ago
  4. 31ae35a resolve merge conflicts of 7fa2b10732 to master by Wonsik Kim · 10 years ago
  5. 45f1885 Merge "Fix format string for Modular DRM for MediaPlayer" by Hassan Shojania · 10 years ago
  6. 06a7081 Fix format string for Modular DRM for MediaPlayer by Hassan Shojania · 10 years ago
  7. 9e96ca0 Merge "Fix format string for Modular DRM for MediaPlayer" by Hassan Shojania · 10 years ago
  8. e00e392 Fix format string for Modular DRM for MediaPlayer by Hassan Shojania · 10 years ago
  9. bf2484a Merge "Fix isCryptoSchemeSupported's return value." by TreeHugger Robot · 10 years ago
  10. 9d4a8cf Merge "Modular DRM for MediaPlayer" by Hassan Shojania · 10 years ago
  11. 38875a4 Fix isCryptoSchemeSupported's return value. by Edwin Wong · 10 years ago
  12. df2298a Merge "DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a am: a9cfe53698" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  13. c6ca74d DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a by Wonsik Kim · 10 years ago
  14. b2205a8 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a by Wonsik Kim · 10 years ago
  15. cefac14 Modular DRM for MediaPlayer by Hassan Shojania · 10 years ago
  16. a9cfe53 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 by Wonsik Kim · 10 years ago
  17. ba2f1aa DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 by Wonsik Kim · 10 years ago
  18. e45718e DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 by Wonsik Kim · 10 years ago
  19. 5b83000 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb by Wonsik Kim · 10 years ago
  20. 9014209 Merge "codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 am: b67b0afbf5" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  21. 7fa2b10 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 by Wonsik Kim · 10 years ago
  22. e38187f codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 by Wonsik Kim · 10 years ago
  23. a68afd7 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c by Wonsik Kim · 10 years ago
  24. 028e36f DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours by Wonsik Kim · 10 years ago
  25. b67b0af codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c by Wonsik Kim · 10 years ago
  26. 437d60b DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 by Wonsik Kim · 10 years ago
  27. 9224cc8 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f by Wonsik Kim · 10 years ago
  28. c5343a5 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 by Wonsik Kim · 10 years ago
  29. 3b57c38 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 by Wonsik Kim · 10 years ago
  30. e80b15a codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 by Wonsik Kim · 10 years ago
  31. dbeeaf2 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 by Wonsik Kim · 10 years ago
  32. 2430ff6 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e by Wonsik Kim · 10 years ago
  33. 1dfa590 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours by Wonsik Kim · 10 years ago
  34. 292dc7e DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc by Wonsik Kim · 10 years ago
  35. 58f7175 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 by Wonsik Kim · 10 years ago
  36. 83485b6 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 by Wonsik Kim · 10 years ago
  37. 55d8132 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours by Wonsik Kim · 10 years ago
  38. 9ee35d72 Merge "AudioFlinger: Prevent FastMixer for A2DP sink" by TreeHugger Robot · 10 years ago
  39. 1760d73 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours by Wonsik Kim · 10 years ago
  40. 787a513 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 by Wonsik Kim · 10 years ago
  41. a5e72ec codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 by Wonsik Kim · 10 years ago
  42. da9246f DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 by Wonsik Kim · 10 years ago
  43. 4f428b7 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 by Wonsik Kim · 10 years ago
  44. daaabdc DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e by Wonsik Kim · 10 years ago
  45. afaa438 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e by Wonsik Kim · 10 years ago
  46. 89f501d codecs: handle onReset() for a few encoders am: 5443b57cc5 by Wonsik Kim · 10 years ago
  47. fda6940 AudioFlinger: Prevent FastMixer for A2DP sink by Andy Hung · 10 years ago
  48. 2f77a22 Merge "Update HIDL with CompositorTiming." by Brian C. Anderson · 10 years ago
  49. 45e4bf1 Merge "AudioFlinger: Do not wait for FastMixer if in cold idle." by TreeHugger Robot · 10 years ago
  50. 3db4f4f Merge "audiohal: Remove timeouts in eventflag waits" by TreeHugger Robot · 10 years ago
  51. a898440 Merge changes If5c3dcc9,Ia8be7b9c by TreeHugger Robot · 10 years ago
  52. b4e7791 audiohal: Remove timeouts in eventflag waits by Mikhail Naganov · 10 years ago
  53. 8628961 Merge "libaaudio: remove LEGACY sharing mode" by Phil Burk · 10 years ago
  54. f228531 AudioFlinger: Do not wait for FastMixer if in cold idle. by Andy Hung · 10 years ago
  55. 80959a7 Allow media.codec and media.extractor to specify two policy files. by Jorge Lucangeli Obes · 10 years ago
  56. 5443b57 codecs: handle onReset() for a few encoders by Wonsik Kim · 10 years ago
  57. 09cf7ca Merge "AudioFlinger: Fix memory allocation for client-less tracks" by Andy Hung · 10 years ago
  58. dd447c3 DO NOT MERGE codecs: handle onReset() for a few encoders by Wonsik Kim · 10 years ago
  59. 30ba02e Merge "Revert "Link against libhidltransport."" by TreeHugger Robot · 10 years ago
  60. af51571 Revert "Link against libhidltransport." by Yifan Hong · 10 years ago
  61. b3721c2 Merge "AudioFlinger: Check framecount overflow when creating track" by Andy Hung · 10 years ago
  62. afb3148 AudioFlinger: Fix memory allocation for client-less tracks by Andy Hung · 10 years ago
  63. 23db248 Merge "Don't segfault on fail to create drm factory" by Jeff Tinker · 10 years ago
  64. c82b9c3 Don't segfault on fail to create drm factory by Jeff Tinker · 10 years ago
  65. 1883f69 AudioFlinger: Check framecount overflow when creating track by Andy Hung · 10 years ago
  66. 053a77d Merge "EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 1703e10721" into nyc-mr2-dev-plus-aosp by Jean-Michel Trivi · 10 years ago
  67. 6830949 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 8987fbb09b by Jean-Michel Trivi · 10 years ago
  68. 2138547 Merge "EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 1703e10721" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  69. 3bb00b5 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e by Jean-Michel Trivi · 10 years ago
  70. dbedfa0 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e by Jean-Michel Trivi · 10 years ago
  71. 8987fbb EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 by Jean-Michel Trivi · 10 years ago
  72. 1703e10 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 by Jean-Michel Trivi · 10 years ago
  73. 5c9fcda EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b by Jean-Michel Trivi · 10 years ago
  74. 7ea7597 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 by Jean-Michel Trivi · 10 years ago
  75. 8e86da4 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 by Jean-Michel Trivi · 10 years ago
  76. 654e9f9 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 by Jean-Michel Trivi · 10 years ago
  77. 9169ca1 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 by Jean-Michel Trivi · 10 years ago
  78. 319c6e9 Merge "media: Add metadata mime format parsing support to MPEG4Extractor." by Hangyu Kuang · 10 years ago
  79. 3db88c0 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b by Jean-Michel Trivi · 10 years ago
  80. 3ffe48e EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a by Jean-Michel Trivi · 10 years ago
  81. e5c0e7e EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 by Jean-Michel Trivi · 10 years ago
  82. b9e070a EffectBundle: check nb channels to write speaker angles am: e5a54485e0 by Jean-Michel Trivi · 10 years ago
  83. b0896df EffectBundle: check nb channels to write speaker angles am: e5a54485e0 by Jean-Michel Trivi · 10 years ago
  84. c35f3ae libaaudio: remove LEGACY sharing mode by Phil Burk · 10 years ago
  85. fbfb8e8 Unify media.codec and media.extractor Minijail usage. by Jorge Lucangeli Obes · 10 years ago
  86. 36b31c8 Merge "libmedia: add NULL check before accessing source and destination buffers." by TreeHugger Robot · 10 years ago
  87. 760d007 Merge "Camera: Allow finalizeOutputConfiguration not adding new surface" by TreeHugger Robot · 10 years ago
  88. 30d48d9 Merge "VolumeShaper: Initial implementation" by Andy Hung · 10 years ago
  89. a04f699 libmedia: add NULL check before accessing source and destination buffers. by Santhosh Behara · 11 years ago
  90. e5a5448 EffectBundle: check nb channels to write speaker angles by Jean-Michel Trivi · 10 years ago
  91. b129be3 Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 60a16aeb56" into nyc-mr2-dev-plus-aosp by Marco Nelissen · 10 years ago
  92. 129296c Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 1d0255e990" into nyc-mr2-dev-plus-aosp by Marco Nelissen · 10 years ago
  93. bd84b18 Merge "resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc am: d41141cc0f" into nyc-mr2-dev-plus-aosp by Marco Nelissen · 10 years ago
  94. 2f79966 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc am: bd8cc7483a by Marco Nelissen · 10 years ago
  95. 0976c26 Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 60a16aeb56" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  96. b6483a7 Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 1d0255e990" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  97. d37728a Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 by Marco Nelissen · 10 years ago
  98. 1eb2e0f Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 by Marco Nelissen · 10 years ago
  99. 38a8a8e Merge "resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc am: d41141cc0f" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  100. b5f3a88 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc by Marco Nelissen · 10 years ago