tree 6eb1a118933be4d33faf72b75191fac59f15f6d2
parent 3b1d47e4608822d527172e038dd23f36dea8cc53
parent 6041b5eee1dc3d168944ebdc5abdb244614f0b79
author Chih-hung Hsieh <chh@google.com> 1510689590 +0000
committer android-build-merger <android-build-merger@google.com> 1510689590 +0000

Merge "Use -Werror in device/sample/frameworks/PlatformLibrary/jni" am: eb92aefead am: a499b2238f
am: 6041b5eee1

Change-Id: I57eec02528b38931a5eca28a19f1ba385336e131