| commit | 2cdb924831f5e9d35d677ae457b2739c7ed1bb00 | [log] [tgz] |
|---|---|---|
| author | Yurii Zubrytskyi <zyy@google.com> | Fri May 27 11:11:22 2016 -0700 |
| committer | Yurii Zubrytskyi <zyy@google.com> | Fri May 27 11:11:22 2016 -0700 |
| tree | e21832d637ca86c0f13c9d0c8d95e5424745e7fc | |
| parent | 7c198d3eef7db3b87d8d299a56bc98f9082cf649 [diff] | |
| parent | 204e3fa786a2654cdd72fea770ba55ed794b1f97 [diff] |
resolve merge conflicts of 204e3fa to nyc-mr1-dev-plus-aosp Change-Id: I7fa657156de238c37e7f75a34aac8212855bc4f4