tree 99f24ec55f6ffa60b73e19f7ed62c7d34beff66f
parent 550fa7b4d399858faeb65e9973b8d823fe9f56c5
parent 7136100be687b1dbf2d301f7d67191f0685f48a9
author Tianjie Xu <xunchang@google.com> 1510098484 +0000
committer android-build-merger <android-build-merger@google.com> 1510098484 +0000

Merge "Fix the imgdiff failure when running test_common unittest"
am: 7136100be6

Change-Id: I2077f6ce034c2f3a4c27834aa26422f075e1b0db