diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-19 19:47:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 19:47:12 +0000 |
| commit | 50fa0bd468c3c5e68fe44afcf930170f9f468355 (patch) | |
| tree | 0683bcf6ec172796470596c9c59f8143f7220edf /libs/androidfw/CursorWindow.cpp | |
| parent | 36a107ddbdf0690905e8e269fad2b036ad254890 (diff) | |
| parent | 9a09a5236529962afbaba9893e5eaf72bd6621b4 (diff) | |
| download | frameworks_base-50fa0bd468c3c5e68fe44afcf930170f9f468355.zip frameworks_base-50fa0bd468c3c5e68fe44afcf930170f9f468355.tar.gz frameworks_base-50fa0bd468c3c5e68fe44afcf930170f9f468355.tar.bz2 | |
am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"
* commit '9a09a5236529962afbaba9893e5eaf72bd6621b4':
androidfw: resolve 64-bit build issues
Diffstat (limited to 'libs/androidfw/CursorWindow.cpp')
| -rw-r--r-- | libs/androidfw/CursorWindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/androidfw/CursorWindow.cpp b/libs/androidfw/CursorWindow.cpp index 0f54edb..2b74a33 100644 --- a/libs/androidfw/CursorWindow.cpp +++ b/libs/androidfw/CursorWindow.cpp @@ -1,16 +1,16 @@ /* * Copyright (C) 2006-2007 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 + * 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 + * 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 + * 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. */ |