diff options
| author | James Dong <jdong@google.com> | 2011-03-17 18:06:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 18:06:51 -0700 |
| commit | 2120617f2fb10035022d1a3e76836a278a0e6a18 (patch) | |
| tree | f5de58fa47f2b0f50133a9a5b8d16e83e5746e91 /services/input/tests | |
| parent | 0f3340cf992f5a40a6011c15154d9c907bdf65ab (diff) | |
| parent | 14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad (diff) | |
| download | frameworks_base-2120617f2fb10035022d1a3e76836a278a0e6a18.zip frameworks_base-2120617f2fb10035022d1a3e76836a278a0e6a18.tar.gz frameworks_base-2120617f2fb10035022d1a3e76836a278a0e6a18.tar.bz2 | |
am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
* commit '14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad':
Fix missing AOSP copyright headers for more files
Diffstat (limited to 'services/input/tests')
| -rw-r--r-- | services/input/tests/InputDispatcher_test.cpp | 18 | ||||
| -rw-r--r-- | services/input/tests/InputReader_test.cpp | 18 |
2 files changed, 30 insertions, 6 deletions
diff --git a/services/input/tests/InputDispatcher_test.cpp b/services/input/tests/InputDispatcher_test.cpp index bb3449b..2f846c4 100644 --- a/services/input/tests/InputDispatcher_test.cpp +++ b/services/input/tests/InputDispatcher_test.cpp @@ -1,6 +1,18 @@ -// -// Copyright 2010 The Android Open Source Project -// +/* + * Copyright (C) 2010 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 of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "../InputDispatcher.h" diff --git a/services/input/tests/InputReader_test.cpp b/services/input/tests/InputReader_test.cpp index 075eff3..60d5ede 100644 --- a/services/input/tests/InputReader_test.cpp +++ b/services/input/tests/InputReader_test.cpp @@ -1,6 +1,18 @@ -// -// Copyright 2010 The Android Open Source Project -// +/* + * Copyright (C) 2010 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 of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "../InputReader.h" |