| commit | 39057b2f3495779641d6c53bc86e4c9f2bcb1e51 | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Nov 29 21:39:14 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 29 21:39:14 2016 +0000 |
| tree | dcaf7dbbad5ed6d2a3525f2bbda66d578605b5f9 | |
| parent | b693bf317db5124ec625060a422970ea4658b844 [diff] | |
| parent | f8a2cdb0e81a7970e6154c10121eb8beec2de895 [diff] |
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp