| commit | 704fe2d62895ed591317f4830dc8df2ade640a3e | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Fri Jul 29 08:34:39 2016 -0700 |
| committer | Felipe Leme <felipeal@google.com> | Fri Jul 29 16:12:40 2016 +0000 |
| tree | e19cd2ba82e9bf6111e2514e8ebf0d2f0bd3399a | |
| parent | a6b4b2179433d7293c050db5de07f1af81584301 [diff] | |
| parent | 4acdde9ef027bf91c8b5c48852f12480ed774b0d [diff] |
resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8