TOOLS: Fix missing Apache license and bad merge.
authorphilip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c>
Tue, 5 Jul 2011 07:46:05 +0000 (07:46 +0000)
committerphilip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c>
Tue, 5 Jul 2011 07:46:05 +0000 (07:46 +0000)
commit9dde1f0d947abd00e47e0d0331447ef282733829
tree473da488ee2251fbbcecc1bf201cf8f7d1f64a9e
parent57553743bfcb8a4d96ea9924305035dfc3502b57
TOOLS: Fix missing Apache license and bad merge.

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@292 ee073f10-1060-11df-b6a4-87a95322a99c
cpp/src/phonenumbers/default_logger.cc
cpp/src/phonenumbers/default_logger.h
tools/java/common/test/com/google/i18n/phonenumbers/tools/BuildMetadataFromXmlTest.java