tree 189764eb086fbf331b5928a45a39ce324bba1532
parent f69645b0a8e5462740e96102f464c0eb086590cf
parent ad2bf54fda7bccf27b15c996f8a4f7f71ccf10e4
author Chris Wren <cwren@android.com> 1468444254 +0000
committer android-build-merger <android-build-merger@google.com> 1468444254 +0000

Merge \"sync rich comments back from google3\" into nyc-mr1-dev
am: ad2bf54fda

Change-Id: I0df7c551441fea3dfe4c00fd69ba2942b520dd7e