am 79e7c0a9: Merge remote-tracking branch \'goog/master\' into merge-from-master

* commit '79e7c0a98e0ffd5af09dac4d6ab7a7449b93b472':
This commit is contained in:
Elliott Hughes 2014-05-30 04:05:29 +00:00 committed by Android Git Automerger
commit 0e4aa8db3f

Diff Content Not Available