tree 97d2d2b6714ca96f0051c296d99f72d111269847
parent e9ca8e83f940adb42e28a304b4818c9a3b049880
parent 5ee1a3f91d6ddd8bb0d3b0be661c5b6ac685bfd4
author Zhizhou Yang <zhizhouy@google.com> 1499879859 +0000
committer android-build-merger <android-build-merger@google.com> 1499879859 +0000

Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03 am: eb4ab6899f am: e16f386f0a
am: 5ee1a3f91d

Change-Id: I45eead1c51b19ddb67f7a27f968dcc47dbaab327