tree 23e5ea182783b5db03eccaa543d7dbe7f0046020
parent 2c9a8e5d52d19cd7fa212260c25798b981070d41
parent 4b2c9d6005e95627dc32ec257e28b28a4e0df0fd
author Chih-Hung Hsieh <chh@google.com> 1469559495 +0000
committer android-build-merger <android-build-merger@google.com> 1469559495 +0000

Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: 02301db045 am: 529b548597
am: 4b2c9d6005

Change-Id: I7aca5d67077ce7603b15a83c362fa516e9615b84