| commit | 3ce26fa7d4ed5bfa1a3b546ea6772a964d5f476e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Mar 13 15:54:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 15:54:49 2014 +0000 |
| tree | ae7ed8fc4968d21e9f297a98b3a9dd7699dc1d21 | |
| parent | c0c2a612fecf64fdfda273ae7ba4da5409b3d3ff [diff] | |
| parent | 897d345b1f2672480346e5dc8971a4626f3f1b8b [diff] |
am 897d345b: Merge "don\'t load property_contexts from /data" * commit '897d345b1f2672480346e5dc8971a4626f3f1b8b': don't load property_contexts from /data