diff options
| author | Billy Lau <billylau@google.com> | 2015-07-29 23:36:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 23:36:20 +0000 |
| commit | bafb51305731fd837b12878fffabe8885239ea10 (patch) | |
| tree | 7cf9788d51cf17c9ecd774ade1161eea027f01f2 /libs/androidfw/ZipFileRO.cpp | |
| parent | 7fcd652037a104212dbb87ce1faa52b009a67de1 (diff) | |
| parent | ee2ee0f92d6b18c9e09b32d6ceba9fe22db0565d (diff) | |
am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
* commit 'ee2ee0f92d6b18c9e09b32d6ceba9fe22db0565d':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions