tree dc106ae5bc4d9b4ee8018b4037a609523eb3655d
parent d0271a642a414e36bc87f64328a3a812aa9081dc
parent b96ed7e6e04435f2e17e90d3de948ffbd58d9376
author Chih-hung Hsieh <chh@google.com> 1513034927 +0000
committer android-build-merger <android-build-merger@google.com> 1513034927 +0000

Merge "Fix warning in system/vold/tests."
am: b96ed7e6e0

Change-Id: I0d8dbf26cd9769307adc0a1ce0d4d02a8bff9382