diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-01-28 13:33:04 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-01-28 13:59:14 -0800 |
| commit | cb3f428810456dbb31211ed421401b90fb3b6586 (patch) | |
| tree | 223b19c24f8b36ddce916e5e01cb025951e48661 /Makefile.am | |
| parent | b13874d59e976371a1a87e6dc2bf347ed0a0ce5d (diff) | |
| download | protobuf-cb3f428810456dbb31211ed421401b90fb3b6586.tar.gz protobuf-cb3f428810456dbb31211ed421401b90fb3b6586.tar.bz2 protobuf-cb3f428810456dbb31211ed421401b90fb3b6586.zip | |
Undo the Java module change for integration.
Moving the files to their original location, so that opensource changes
can be picked during the internal merge. Those files will be moved into
the correct location after merging with internal code.
Note: do NOT merge this into master without the other internal
down-integration commit.
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions