diff options
| author | Nick Kralevich <nnk@google.com> | 2015-10-23 02:02:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 02:02:42 +0000 |
| commit | 1b28b05d2edf11f49717b53cd49a9161892f0388 (patch) | |
| tree | b43ee84a8ddb15c83dadcd7225e578ff4fedc49d /libs/binder/IPermissionController.cpp | |
| parent | 9830f11dc6b6aa4001c79147966fdb9eaa71c2f2 (diff) | |
| parent | 9ec978732f8dd82e7adef3e37097eaca3fbd65f0 (diff) | |
| download | frameworks_native-1b28b05d2edf11f49717b53cd49a9161892f0388.zip frameworks_native-1b28b05d2edf11f49717b53cd49a9161892f0388.tar.gz frameworks_native-1b28b05d2edf11f49717b53cd49a9161892f0388.tar.bz2 | |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
am: 9ec978732f
* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Diffstat (limited to 'libs/binder/IPermissionController.cpp')
0 files changed, 0 insertions, 0 deletions