tree a095402bf8c88d8d0cf90d249a99c9ac3e877751
parent 2cce579ed234711bbffb4ec0181c0e7bc4f4805b
parent 1eafb666c24736be4454c199a62c256c55e86bc4
author Steve McKay <smckay@google.com> 1445892669 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445892669 +0000

Merge "Address followup comments from 793838."