tree 32b64c6bef0ff3978caa66f3a6bfbd1909a3dd35
parent a6dcaa6f846440da99f03fb221d17fc5fa8b7016
parent 58f5bd5412d315ccbd80ebf9e1d2f297f159fe0d
author Chris Wren <cwren@android.com> 1456866169 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456866171 +0000

Merge "Revert "add all those great comments from the other file."" into nyc-dev