| commit | 3069899688d42d372d860d06f592aa53678baae2 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Mon Nov 28 14:29:38 2016 -0800 |
| committer | Felipe Leme <felipeal@google.com> | Mon Nov 28 14:29:38 2016 -0800 |
| tree | 18a38e5175aba7546fab810bac5d3f944db37ce1 | |
| parent | 6d938865ea2861ae50c6041e3c3b3276b8dcf0e6 [diff] | |
| parent | dfc9df466fdd6b830b500326a7368f0c46134e11 [diff] |
resolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp Change-Id: I5da1f949bc1edb7dae110f3ab2a7328f9b1b02e9