| commit | b8926137934c41baa498fa822661ed612d0696ce | [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 | 857230c5d9c51766947c546741dbbba5c41df54d [diff] | |
| parent | 485c647432e2ef8a2ae63691d89cb19c7239d96e [diff] |
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp