diff --git a/camera/camera_platform.aconfig b/camera/camera_platform.aconfig
index 63a514d..2266483 100644
--- a/camera/camera_platform.aconfig
+++ b/camera/camera_platform.aconfig
@@ -90,3 +90,10 @@
      description: "Only trigger lazy HAL instantiation when the HAL is needed for an operation."
      bug: "319735068"
 }
+
+flag {
+     namespace: "camera_platform"
+     name: "return_buffers_outside_locks"
+     description: "Enable returning graphics buffers to buffer queues without holding the in-flight mutex"
+     bug: "315526878"
+}