| commit | 91eb8ed98b56be1a93c50fed3a75616ff129bba6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:32:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:32:15 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 44171834b9252efdb2d46e7bcd2416f60d976804 [diff] | |
| parent | 2acbf47f8153719968ca870fb9289a694aa7f732 [diff] |
am 7a94a2e6: am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly." * commit '7a94a2e6397dade98c3025a2bc87c7e67e27e096':