diff options
| author | Samuel Tan <samueltan@google.com> | 2015-12-17 00:35:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-17 00:35:35 +0000 |
| commit | 477fa220b1766a3822171fa514983198e09daabb (patch) | |
| tree | 160c557d172e6b06e45d6c20b037d07a6acbe186 /core/java | |
| parent | 79ac3edc57f93d6b8e8187b549dd23512b841fb2 (diff) | |
| parent | 0bae77b8f0cdc6272abf56a831c8ebfa0e9ed6a0 (diff) | |
Merge "Specify path for native PersistableBundle implementation"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/PersistableBundle.aidl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/os/PersistableBundle.aidl b/core/java/android/os/PersistableBundle.aidl index 5b05873257c5..94e86076308d 100644 --- a/core/java/android/os/PersistableBundle.aidl +++ b/core/java/android/os/PersistableBundle.aidl @@ -2,19 +2,19 @@ ** ** Copyright 2014, 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. */ package android.os; -parcelable PersistableBundle; +parcelable PersistableBundle cpp_header "binder/PersistableBundle.h"; |
