| commit | d11f76a5860802ea21f46993ce094d613214a40d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Mar 12 22:42:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 22:42:37 2014 +0000 |
| tree | 56e75310f0350c917a038602eb0f9c02b55c503e | |
| parent | af9f065b2bfdf347bbfa5fce5227975fd4e060c3 [diff] | |
| parent | f4c1abcbce012a80a1bd32e5a83ab24aa2a6807d [diff] |
am f4c1abcb: am 897d345b: Merge "don\'t load property_contexts from /data" * commit 'f4c1abcbce012a80a1bd32e5a83ab24aa2a6807d': don't load property_contexts from /data