tree 3fa234475eaccbffb3dad2349e094f9196cdc201
parent f45e81e85aa2849468c3d161c6e0c9247bf3c730
parent 64204a8302e3df7216e8da78833e3f7451145ba4
author Steve McKay <smckay@google.com> 1504137789 +0000
committer android-build-merger <android-build-merger@google.com> 1504137789 +0000

Merge "Fix build warnings about resources." into oc-mr1-dev
am: 64204a8302

Change-Id: I1f9e494256df9b97b1678d1aa69c0d0b345c5afb