| commit | 5eee5988c1a9381a1a3961cd434d9ce162ba8cfb | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Wed Jun 07 18:07:43 2017 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Wed Jun 07 19:54:21 2017 -0700 |
| tree | c8a2947582d365fc8486f32f941ceb87f1c481c7 | |
| parent | 1520d813e0ec6313ec2002f260b4292dcbeb0ee6 [diff] | |
| parent | 7ea4f66f355757296f03b74444f1b30fb2a14b06 [diff] |
resolve merge conflicts of 7ea4f66f3557 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7