OSDN Git Service

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


Trivial merge