tree 037b88ce438a42c3ff395322e6b164cc9293cb34
parent d47b15af8872a34bcf143248fc6d0bff3e27a84a
parent a57b72b7247b7f0fee34f9ab672d0148227cf18a
author Jungshik Shin <jungshik@google.com> 1490654372 +0000
committer android-build-merger <android-build-merger@google.com> 1490654372 +0000

Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev am: af0fb41585  -s ours am: 2c3d03cd25 am: cde256301e am: ebc12319c2 am: 92f36d1435
am: a57b72b724

Change-Id: Ie723c4a91e4e3b9cdceff389dee606fed1b4e50b