tree d6276918df579a5f0270a62386b7899c210e3ef7
parent d2382ff79f5ae4f2c8bc9fce2dc42d909051a16a
parent 0ae269e414e17e77e15a3963cab89f140a34d4bb
author Paul Duffin <paulduffin@google.com> 1484751019 +0000
committer android-build-merger <android-build-merger@google.com> 1484751019 +0000

Merge "Remove reference to non-existent resources directory" am: 8647200f8a am: 8a82a62902 am: b7accc584c
am: 0ae269e414

Change-Id: Ib82124e2d37b65b0dc4bdf75495f10ca712ef957