am 6feb3ec4: am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."

* commit '6feb3ec46cc5fe72b6680b61513673e75779c45e':
This commit is contained in:
Elliott Hughes 2015-08-27 14:31:41 +00:00 committed by Android Git Automerger
commit b12237ab71

Diff content is not available