tree 4d5db09a9e16023fcf0c425dc6e81f36d7ad8d14
parent e9245d1721c8d6066523f459a9fbc84da821e6ca
parent f7a8623a09a6fe0d38b16fcfd81316f29235480d
author Gary Mai <garymai@google.com> 1540947030 -0700
committer android-build-merger <android-build-merger@google.com> 1540947030 -0700

[automerger] Patch URI vulnerability in contact photo editing am: ccfd94b965 am: 2fc4d78bfc am: fc6e94648d am: 3ffe76ed9c am: 456f745849 am: 9df22bbe22 am: b96186029f am: 655ad64631 am: acdfb82c89
am: f7a8623a09

Change-Id: I1ccd77636a3383be1bd46cef2c998872250fb6e3