tree 0810536602b99f85236e97086fc145c859fd869a
parent cc1f61f11dd70aa1e0a315e572e03710abdba3e8
parent 0488c3d83099c4d82f5ddc41c045bc7b7833de29
author Wenyi Wang <wenyiw@google.com> 1459302758 +0000
committer android-build-merger <android-build-merger@google.com> 1459302758 +0000

Merge "Revert "Don\'t use file ID of the removed photo"" into nyc-dev
am: 0488c3d

* commit '0488c3d83099c4d82f5ddc41c045bc7b7833de29':
  Revert "Don't use file ID of the removed photo"

Change-Id: Ifbdb9af436ddde7fb70fc6d718338ef27d558efd