tree d6e33caf38973e861a6f819c4743e7c8e66fb291
parent 20a96fea8087561d012e9fe2f15c31e03b04855d
parent 55cd5e185aa597363b542b8db4b788bca47ff5e0
author Daniel Nishi <dhnishi@google.com> 1504323582 +0000
committer android-build-merger <android-build-merger@google.com> 1504323582 +0000

Merge "Add a photos app filter and a metric for using it." into oc-mr1-dev
am: 55cd5e185a

Change-Id: I66618c70782cae85036185e14e9a20b8568f90ec