commit | ef64e14582b4f003bc10467652ad88b362d4279d | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 06 17:29:49 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 17:29:49 2015 +0000 |
tree | c796c4542f3292bee92426790940f8e3430a9607 | |
parent | ee6c2ad51aedd2bee1e2965f6e05cbd6871b9d72 [diff] | |
parent | 9e5919f2884f6374506b6224efb2e5228caa7e0b [diff] |
am ff52e23f: Merge "Stop being silly." * commit 'ff52e23f0327ec1b68495e84f7e42e7c3a3d3f0e': Stop being silly.