tree 90c9ce594962f8e02988954d500c580d4bf9ed79
parent 1d16d773b0d2d12301bda68d15adc6953ce68710
parent a41f2445156fe0bcfde6bd4d813dfc43796a526d
author John Reck <jreck@google.com> 1460128164 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460128166 +0000

Merge "Fix a derp" into nyc-dev