tree 9d819b723aad5035b3cc0b1466e445f7de1ec71f
parent 4f8fc7b561fd9eb447519f94a0d34793ab125e92
parent 3b4173297a2aca1d826e18e8d8c524f9bf46774d
author Zhizhou Yang <zhizhouy@google.com> 1502240136 +0000
committer android-build-merger <android-build-merger@google.com> 1502240136 +0000

Merge "Fix Android Compiler Warning in system/keymaster" am: d34d9f7a52 am: f56e1ce9cb
am: 3b4173297a

Change-Id: I603060754de67c679adf50187b32911aa75ecf7c