tree 41e984dda14e24fe923c4fd0409c7cc9b7ea3695
parent e771251424bc01fbf663dd5aa8ffa6938bbae29c
parent 48bd6f53f4d866895372631e200ac640140c28b1
author Joe Onorato <joeo@google.com> 1460054083 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460054083 +0000

Merge changes I8f95f3f8,Ic2e384ad into nyc-dev

* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.