1. 4b6ae38 Merge "libcamera2ndk_vendor: Don't retrieve value from failed HIDL calls." into qt-dev am: 9c8dfd599c am: c7c45c606a by Jayant Chowdhary · 7 years ago
  2. 498bfde Merge "libcamera2ndk_vendor: Don't retrieve value from failed HIDL calls." into qt-dev am: 9c8dfd599c by Jayant Chowdhary · 7 years ago
  3. c7c45c6 Merge "libcamera2ndk_vendor: Don't retrieve value from failed HIDL calls." into qt-dev by Jayant Chowdhary · 7 years ago
  4. 9c8dfd5 Merge "libcamera2ndk_vendor: Don't retrieve value from failed HIDL calls." into qt-dev by Jayant Chowdhary · 7 years ago
  5. 2491414 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master am: 25739def77 -s ours am: c86ffbb4c0 by Xin Li · 7 years ago
  6. 285c754 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 14d84c7bda -s ours am: f835e376dc by Xin Li · 7 years ago
  7. c2505ea [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master am: 25739def77 -s ours by Xin Li · 7 years ago
  8. 8adb24b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 14d84c7bda -s ours by Xin Li · 7 years ago
  9. c86ffbb [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master by Xin Li · 7 years ago
  10. f835e37 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master by Xin Li · 7 years ago
  11. 25739de Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master by TreeHugger Robot · 7 years ago
  12. 1fd22dc Merge "Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev am: 8caf80a23a am: 892aa37081" into qt-r1-dev-plus-aosp by Shuzhen Wang · 7 years ago
  13. 165e001 Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev am: 8caf80a23a am: e74399e4ab by Shuzhen Wang · 7 years ago
  14. f8634cb Merge "Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev am: 8caf80a23a am: 892aa37081" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  15. dbb5817 Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev am: 8caf80a23a by Shuzhen Wang · 7 years ago
  16. 32f8ff7 Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev am: 8caf80a23a by Shuzhen Wang · 7 years ago
  17. e74399e Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev by Shuzhen Wang · 7 years ago
  18. 892aa37 Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev by Shuzhen Wang · 7 years ago
  19. 8caf80a Merge "Camera: Use original format and dataSpace for reconfigure" into qt-dev by TreeHugger Robot · 7 years ago
  20. 51e090a Merge "Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev am: ca77ca26c1 am: fd643d425f" into qt-r1-dev-plus-aosp by Jayant Chowdhary · 7 years ago
  21. a08d5ab Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev am: ca77ca26c1 am: b2cd3dcaa3 by Jayant Chowdhary · 7 years ago
  22. 1592f9f Merge "Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev am: ca77ca26c1 am: fd643d425f" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  23. 7ad6cf7 Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev am: ca77ca26c1 by Jayant Chowdhary · 7 years ago
  24. 0664e4b Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev am: ca77ca26c1 by Jayant Chowdhary · 7 years ago
  25. fd643d4 Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev by Jayant Chowdhary · 7 years ago
  26. b2cd3dc Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev by Jayant Chowdhary · 7 years ago
  27. ca77ca2 Merge "cameraserver: Stop appOps camera reporting for vendor clients." into qt-dev by Jayant Chowdhary · 7 years ago
  28. cbc6f10 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours am: f5ec24e8df -s ours am: bb33e80eef -s ours by Jean-Michel Trivi · 7 years ago
  29. 22779cf [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours am: f009a27850 -s ours am: f3322745eb -s ours by Jean-Michel Trivi · 7 years ago
  30. c585766 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours am: f5ec24e8df -s ours am: 16a79b26ea -s ours by Jean-Michel Trivi · 7 years ago
  31. 8228d29 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours am: f009a27850 -s ours am: ebe40834c2 -s ours by Jean-Michel Trivi · 7 years ago
  32. 96b1d1f [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours am: f5ec24e8df -s ours by Jean-Michel Trivi · 7 years ago
  33. b1319ec [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours am: f009a27850 -s ours by Jean-Michel Trivi · 7 years ago
  34. f81d2e7 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours am: f5ec24e8df -s ours by Jean-Michel Trivi · 7 years ago
  35. 2da3966 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours am: f009a27850 -s ours by Jean-Michel Trivi · 7 years ago
  36. 16a79b2 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours by Jean-Michel Trivi · 7 years ago
  37. ebe4083 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours by Jean-Michel Trivi · 7 years ago
  38. bb33e80 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours am: 537bb11d8d -s ours by Jean-Michel Trivi · 7 years ago
  39. f332274 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours by Jean-Michel Trivi · 7 years ago
  40. f5ec24e [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours am: 29b1c433c2 -s ours by Jean-Michel Trivi · 7 years ago
  41. f009a27 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours by Jean-Michel Trivi · 7 years ago
  42. 537bb11 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a am: 66171de55c -s ours by Jean-Michel Trivi · 7 years ago
  43. b1ff5c4 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours by Jean-Michel Trivi · 7 years ago
  44. 29b1c43 [automerger skipped] Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev am: 12b4e9b11a by Jean-Michel Trivi · 7 years ago
  45. 83ded33 [automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 by Jean-Michel Trivi · 7 years ago
  46. 66171de Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev by Jean-Michel Trivi · 7 years ago
  47. c49dabd [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e by Jean-Michel Trivi · 7 years ago
  48. 12b4e9b Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev by TreeHugger Robot · 7 years ago
  49. c14c499 Merge "[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours am: 814d18929c -s ours am: f52f79e2b9 -s ours by Jean-Michel Trivi · 7 years ago
  50. ecceb3b [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours am: 814d18929c -s ours am: 307a0e2aa2 -s ours by Jean-Michel Trivi · 7 years ago
  51. b730e3b Merge "[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours am: 814d18929c -s ours am: f52f79e2b9 -s ours am skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  52. 1e58d4b [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours am: 814d18929c -s ours by Jean-Michel Trivi · 7 years ago
  53. e8e5617 [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours am: 814d18929c -s ours by Jean-Michel Trivi · 7 years ago
  54. 307a0e2 [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours by Jean-Michel Trivi · 7 years ago
  55. f52f79e [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours by Jean-Michel Trivi · 7 years ago
  56. 814d189 [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours by Jean-Michel Trivi · 7 years ago
  57. cd459ba [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours by Jean-Michel Trivi · 7 years ago
  58. 3186eb6 [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours by Jean-Michel Trivi · 7 years ago
  59. 7242dcd [automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx by Jean-Michel Trivi · 7 years ago
  60. ca3627b Merge "[automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours am: 9b84e7e55f -s ours by Jean-Michel Trivi · 7 years ago
  61. 4c6ebb9 [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours am: 03f1014ef9 -s ours by Jean-Michel Trivi · 7 years ago
  62. 2b04fb5 Merge "[automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours am: 9b84e7e55f -s ours am skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 82cb46d0d5 is in history" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  63. 5bdd134 [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours by Jean-Michel Trivi · 7 years ago
  64. 71c9290 [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours by Jean-Michel Trivi · 7 years ago
  65. 03f1014 [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours by Jean-Michel Trivi · 7 years ago
  66. 9b84e7e [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours by Jean-Michel Trivi · 7 years ago
  67. 8e552f1 [automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 by Jean-Michel Trivi · 7 years ago
  68. 4d5d3df Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev by Jean-Michel Trivi · 7 years ago
  69. dc8528f Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  70. 3fb962c Merge "Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b am: ff5cb9bf43" into qt-r1-dev-plus-aosp by Marco Nelissen · 7 years ago
  71. aed8b80 Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b am: bad89fdc5e by Marco Nelissen · 7 years ago
  72. f30859c [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx by Jean-Michel Trivi · 7 years ago
  73. 09cc4d6 Merge "Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b am: ff5cb9bf43" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  74. 4987269 Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b by Marco Nelissen · 7 years ago
  75. 4c580ad Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b by Marco Nelissen · 7 years ago
  76. ff5cb9b Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b by Marco Nelissen · 7 years ago
  77. bad89fd Merge "Cannot play a mov file with alac audio" into qt-dev am: 50f9a1320b by Marco Nelissen · 7 years ago
  78. 50f9a13 Merge "Cannot play a mov file with alac audio" into qt-dev by Marco Nelissen · 7 years ago
  79. 7b671d2 [automerger skipped] Merge "Match src paths with aidl package name" am: 1224227e19 am: c070242550 -s ours am: a83eb6af93 -s ours by Dan Willemsen · 7 years ago
  80. b61526c cameraserver: Stop appOps camera reporting for vendor clients. by Jayant Chowdhary · 7 years ago
  81. ee8026c [automerger skipped] Merge "Match src paths with aidl package name" am: 1224227e19 am: c070242550 -s ours by Dan Willemsen · 7 years ago
  82. a83eb6a [automerger skipped] Merge "Match src paths with aidl package name" am: 1224227e19 by Dan Willemsen · 7 years ago
  83. c070242 Merge "Match src paths with aidl package name" am: 1224227e19 by Dan Willemsen · 7 years ago
  84. 1224227 Merge "Match src paths with aidl package name" by Treehugger Robot · 7 years ago
  85. 9265395 Camera: Use original format and dataSpace for reconfigure by Shuzhen Wang · 7 years ago
  86. e7b3e9f Merge "Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev am: 8581d92e21 am: d12736212b" into qt-r1-dev-plus-aosp by Wonsik Kim · 7 years ago
  87. e3cd754 Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev am: 8581d92e21 am: 5b4aec54ee by Wonsik Kim · 7 years ago
  88. 14d84c7 DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master by Xin Li · 7 years ago
  89. 8e2ff38 Merge "Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev am: 8581d92e21 am: d12736212b" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  90. bfbbf66 Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev am: 8581d92e21 by Wonsik Kim · 7 years ago
  91. 7e96a6e Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev am: 8581d92e21 by Wonsik Kim · 7 years ago
  92. 5b4aec5 Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev by Wonsik Kim · 7 years ago
  93. d127362 Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev by Wonsik Kim · 7 years ago
  94. 8581d92 Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev by Wonsik Kim · 7 years ago
  95. 1be8c1d Merge "Match src paths with aidl package name" into qt-dev-plus-aosp am: f4f4ab3857 by Dan Willemsen · 7 years ago
  96. c0be275 Merge "Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5 am: e0a91a0000 am: be89013ef6 am: b8c6bb3bb4 am: 83b5e747b5" into qt-r1-dev-plus-aosp by Robert Shih · 7 years ago
  97. 5f7f327 Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5 am: e0a91a0000 am: be89013ef6 am: b8c6bb3bb4 am: f3d5ce8d46 by Robert Shih · 7 years ago
  98. a68d87c Merge "Match src paths with aidl package name" into qt-dev-plus-aosp by Dan Willemsen · 7 years ago
  99. d2886ac Merge "Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5 am: e0a91a0000 am: be89013ef6 am: b8c6bb3bb4 am: 83b5e747b5" into qt-r1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  100. aa6adfb Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5 am: e0a91a0000 am: be89013ef6 am: b8c6bb3bb4 by Robert Shih · 7 years ago