summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Nicolas Prevot <nprevot@google.com> 2015-06-29 17:25:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 17:25:10 +0000
commitd1d1a700501242cca06b5729c2bd888d6f2d4d52 (patch)
tree68971d00f67aceacfeb85ca8a0c33c86694d31d6 /libs/androidfw/ZipFileRO.cpp
parentc561497116bd336160a33839650d11cad14d7dc9 (diff)
parent64c0c4da555f6d38b9c2516f855b49e6b501b783 (diff)
am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
* commit '64c0c4da555f6d38b9c2516f855b49e6b501b783': Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions