tree 037b88ce438a42c3ff395322e6b164cc9293cb34
parent dd935ebc387887ae591598388d5749ac7838fec1
parent 4033badd6885a5e8adfe6d8fc5634db366492340
author Jungshik Shin <jungshik@google.com> 1490654414 +0000
committer android-build-merger <android-build-merger@google.com> 1490654414 +0000

Merge "Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev am: af0fb41585  -s ours" into nougat-mr1-cts-dev am: 9d89b4c74f  -s ours am: d313f3fb13 am: 005e83a209
am: 4033badd68

Change-Id: I4cb0bed15ae46334df853a3df99b3e0a28f494c7