| commit | ffcbc3f1d49191fe924a2b0237c5d92d0d80af0d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Mar 12 23:05:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 23:05:03 2014 +0000 |
| tree | c58db6cbdf6bdf7299527ca49142b1e94966c7cd | |
| parent | 381edf5ecb66494b6eb35c571a69dded4074cd1b [diff] | |
| parent | d11f76a5860802ea21f46993ce094d613214a40d [diff] |
am d11f76a5: am f4c1abcb: am 897d345b: Merge "don\'t load property_contexts from /data" * commit 'd11f76a5860802ea21f46993ce094d613214a40d': don't load property_contexts from /data