tree bc5762274c77fa4da0eccac6619a0c14f855529c
parent 506847aa92fa1045c6a61ff1e43b8e8e358fce0f
parent 2f9c55d8c16c59dfbcfa87fb259f91f572a6ef87
author Jerome Gaillard <jgaillard@google.com> 1492770187 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492770192 +0000

Merge "Update golden image following Change If9039398"