| commit | 27ceab924f8b354f1f4f4901e688000401e6adec | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Jul 28 13:29:01 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Fri Jul 28 13:29:01 2017 -0400 |
| tree | a521e3baa99f943e4a34cf8df60ea48059efa6d5 | |
| parent | ac718ee66bacf16baf859b51de39ce443d68b496 [diff] | |
| parent | 148db9dfa669e6a0a571f58195911a4da43c658b [diff] |
resolve merge conflicts of 148db9dfa669 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Idc9270dda8225d8e36204a2bc4fd41c7b864ca1a