| commit | 30e20e721b5ed0b2870bd60d91e988c3674e19c2 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Fri Aug 03 08:51:37 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 03 08:51:37 2018 -0700 |
| tree | fb6847cdb737856462f5576cc43023d11db8dc3d | |
| parent | 7782d45a9e43a525efe084c52e75fbfed30aaca6 [diff] | |
| parent | 63a983a3311accda032c160487556ea84d5cd7b9 [diff] |
[automerger skipped] Merge "Camera: Handle duplicate camera Id due to openLegacy support" into stage-aosp-master am: 2a9191b992 am: 63a983a331 -s ours Change-Id: I0d69a66fe04369130b51c730a0278d47832cf35f