| commit | 726af41e68148b3a7561e0e1a37874e3883814e4 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Nov 02 13:58:03 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Thu Nov 02 20:59:39 2017 +0000 |
| tree | 1a35a941c07dc77a2b0457df376b9738196eae02 | |
| parent | 0d6bbbcc1e8b351522e1b6b64482bb66fb7a2fc0 [diff] | |
| parent | dd5206c57cdba5633dcb750a59431c3603ad2af9 [diff] |
resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp This version of configstore was removed internally. Test: I solemnly swear I tested this conflict resolution. Change-Id: I589addff6aec7bb7a8a7938d75c51dcc56116a42