| commit | 2acbf47f8153719968ca870fb9289a694aa7f732 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:20 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 3e59e71514798384a453afebfb59d8f867410224 [diff] | |
| parent | e5a1a816c7c92f17ef78d1345a6e938b29356901 [diff] |
am f87bc344: (-s ours) am 802c6fd0: am ff52e23f: Merge "Stop being silly." * commit 'f87bc34412dc11ee59319cd5aba7b34d14f51b85':