| commit | d3cdfafede3c73b53172615330d4d9d93f329b8b | [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 | a3f1445f27acb68c8f7ed8abe50cbc33af16e7ad [diff] | |
| parent | 28070783be9b13ffc68742d98ff919ba5527e250 [diff] |
resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8