tree 35c93afb6e02d7ffb62fc269d8556a6408c6a22d
parent 2dffa3cc34418696a0d5e8a7b9ef15c52f647b06
parent b7b18246dc86a04053feb93faa4dd4a5680800d5
author Clara Bayarri <clarabayarri@google.com> 1492770502 +0000
committer android-build-merger <android-build-merger@google.com> 1492770502 +0000

Fix build for PhotoViewerSample am: caf8678091
am: b7b18246dc

Change-Id: I52b8d680c7c3e834b3dd3aecb56847a3a14837d6