am 50a29b80: Merge "Fix wrong copyright header comment"

* commit '50a29b808257b71710f2c3dab04030b883e40d83':
  Fix wrong copyright header comment
This commit is contained in:
Ken Wakasa 2013-07-23 03:31:20 -07:00 committed by Android Git Automerger
commit dc3b0c812a

View file

@ -1,5 +1,5 @@
/**
* Copyright (C) 2013 Google Inc.
/*
* Copyright (C) 2013 The Android Open Source Project
*
* 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