tree 6e42337a121b3709783245103f8f00cc4cda3aa7
parent 0bdd9ffd24b266b3b8c79a82db871bf22436ceba
parent a48a22dea98d700327d524310b8af9a0124ab0b5
author Yin-Chia Yeh <yinchiayeh@google.com> 1480534177 +0000
committer android-build-merger <android-build-merger@google.com> 1480534177 +0000

Merge "Camera: fix camera facing override logic" am: 853f568b31 am: f02844c434 am: 379254d561
am: a48a22dea9

Change-Id: I1c2094ec82dd3ec84bf128bf76132b756323302d