| commit | 6dadd3e441ee6791e208491153b471d235335ea1 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Sep 01 09:36:19 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Fri Sep 01 09:36:19 2017 -0400 |
| tree | a04dcfaf95d8a515afd76a6da5bd00b3bd2d41d0 | |
| parent | b23b60e518d0b34af063ae0128ba56f76fbed0d4 [diff] | |
| parent | e30e3430f9365493acf6cef8418c5bd3d16dfbdd [diff] |
resolve merge conflicts of e30e3430f936 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I9d1a10dbad49680a25a64a7a6b3eadca91f9bc7d