tree 25ead761a2e682547f319193c84ba1be885f50c9
parent 45a74ef5bce7a60a3400d14ad88c743eb91fcd37
parent 7cbaf2a659fdc23f4e85022bfb058e0bb55701fc
author Andreas Gampe <agampe@google.com> 1520014813 +0000
committer android-build-merger <android-build-merger@google.com> 1520014813 +0000

Merge "Email: Fix StoreTests" am: 6eb899d47c am: c5f58810f0
am: 7cbaf2a659

Change-Id: I38915da6040113fce7efcff53443d665ddfde26b