OSDN Git Service

am d5ff09c2: am 8d50e16a: Merge "Guard against @google.com.example.com."
authorDan Albert <danalbert@google.com>
Mon, 12 Jan 2015 21:59:18 +0000 (21:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Jan 2015 21:59:18 +0000 (21:59 +0000)
* commit 'd5ff09c23a954d20b0dc21750dc5c0a666c0ce56':
  Guard against @google.com.example.com.


Trivial merge