| commit | bb63ee33116fb4aff5e3a0712175705e8cf04fd7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 06 17:40:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 17:40:27 2015 +0000 |
| tree | 2da40cd33cfc73e9a172d52316d44e1f335cfdd1 | |
| parent | 5f8d3c6dfffb158129f00ebcd1f0943b63043ca6 [diff] | |
| parent | cb9093d8279c9f4885049b7ccc42e6d5907d8d35 [diff] |
am 9f78b826: am 802c6fd0: am ff52e23f: Merge "Stop being silly." * commit '9f78b82661a40827ed464282bb4c83ec1b134aee': Stop being silly.