| commit | 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Apr 20 17:42:43 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Thu Apr 20 17:42:43 2017 -0700 |
| tree | 5342449d037f3d4da2f9b8a62659a89350b10002 | |
| parent | 73c92155627909196b0d32ccc3af6bd1074a434f [diff] | |
| parent | 03e80b4624a5ccc3a3d4cc2e5390464868731381 [diff] |
resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I3f41140bf5f10e03667a9e36c29df0d3e90d7bb0