summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-03-12 23:05:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-12 23:05:03 +0000
commitffcbc3f1d49191fe924a2b0237c5d92d0d80af0d (patch)
treec58db6cbdf6bdf7299527ca49142b1e94966c7cd /include
parent381edf5ecb66494b6eb35c571a69dded4074cd1b (diff)
parentd11f76a5860802ea21f46993ce094d613214a40d (diff)
downloadsystem_core-ffcbc3f1d49191fe924a2b0237c5d92d0d80af0d.zip
system_core-ffcbc3f1d49191fe924a2b0237c5d92d0d80af0d.tar.gz
system_core-ffcbc3f1d49191fe924a2b0237c5d92d0d80af0d.tar.bz2
am d11f76a5: am f4c1abcb: am 897d345b: Merge "don\'t load property_contexts from /data"
* commit 'd11f76a5860802ea21f46993ce094d613214a40d': don't load property_contexts from /data
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions