summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-11-12 01:15:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-12 01:15:16 +0000
commit15de62de26a3ef936a219daf65ec5d388197a9fc (patch)
tree881ffcd95bc45f3f7791a156aeef7ee32d06fcf3 /include
parent5716ebe50debab01ede01b2f99abde85a250c82c (diff)
parent93ffd5dc0a243af87f8ba106fe98df7a7ed2c484 (diff)
downloadframeworks_base-15de62de26a3ef936a219daf65ec5d388197a9fc.zip
frameworks_base-15de62de26a3ef936a219daf65ec5d388197a9fc.tar.gz
frameworks_base-15de62de26a3ef936a219daf65ec5d388197a9fc.tar.bz2
Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev
automerge: 93ffd5d * commit '93ffd5dc0a243af87f8ba106fe98df7a7ed2c484': Allow profile owners to set the unknown source setting
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions