| commit | 257cdc33dbfd9340d132af42c7d49d62551678d6 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Oct 25 14:13:13 2016 -0700 |
| committer | Felipe Leme <felipeal@google.com> | Tue Oct 25 21:15:42 2016 +0000 |
| tree | eaef6c5bfce560f1af2d3584927446d2844cc14e | |
| parent | 22e91a5b8fa06c11b23826fb17570ce5a345d7ee [diff] | |
| parent | a97a2825092ace891e748a9af0d246ed429856b4 [diff] |
resolve merge conflicts of a97a282 to nyc-mr2-dev-plus-aosp BUG: 32365477 Change-Id: I8075346262e94ca64b144a42f2e886496ffff62c