Merge "Use -Werror in packages/apps/Gallery2"
am: 24309021fb

Change-Id: Iee490c18f1d60f20ba19e304614c01fe481ff0d8