Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Specify path for native PersistableBundle implementation" am: 477fa220b1

Browse Source 
am: 0bc7647f63

* commit '0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
  Specify path for native PersistableBundle implementation
This commit is contained in:
Samuel Tan
2015-12-17 09:52:11 -08:00
committed by android-build-merger
parent 92e432c30e 0bc7647f63
commit 33d5888d7a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/os/PersistableBundle.aidl
View File

@@ -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";