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