huge sync with internal version

2013-06-11 14:51:23 +00:00
parent 1749bbe14c
commit 72e547c935
37 changed files with 79 additions and 74 deletions
--- a/examples/cpp/fap_parser.cc
+++ b/examples/cpp/fap_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2010-2012 Google
+// Copyright 2010-2013 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at