| commit | 9f78b82661a40827ed464282bb4c83ec1b134aee | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 06 17:35:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 17:35:28 2015 +0000 |
| tree | 9108db652cfe2f5740d30959b11b05002ffdcd02 | |
| parent | 39ac94793949df753472724bcdd5d29098e0f8cc [diff] | |
| parent | 802c6fd0900863b576b9d2c1b0b482988f14dd33 [diff] |
am 802c6fd0: am ff52e23f: Merge "Stop being silly." * commit '802c6fd0900863b576b9d2c1b0b482988f14dd33': Stop being silly.