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

am: c025ce8806  -s ours

Change-Id: I64cfa78cb57b5d813c34a0eb725a7dce802c7612
This commit is contained in:
Chih-hung Hsieh 2017-12-11 23:37:26 +00:00 committed by android-build-merger
commit 0667b7e7dd

Diff content is not available