tree 72e38a19e937e4743aa69ba33a2bb35a074229ec
parent 794fab5b4cf7dfc431ce624973d9defe28aad4d2
parent 1981f4292db98ce6189a06cdd8ebaf2f1e8900fc
author Kurt Nelson <kurtn@google.com> 1508976552 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1508976552 +0000

Merge "Use annotation instead of comment"