| commit | a68c1e8ea7932466ba89dd77d6c27f046d2c3a9d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:31:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:31:41 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | caf42899b952c132709610ac761bc75861aa1f06 [diff] | |
| parent | e37ab0a7388cb2dd9b6702bf62f75b1327c88d76 [diff] |
am 6feb3ec4: am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo." * commit '6feb3ec46cc5fe72b6680b61513673e75779c45e':