| commit | 903d6414e51ace98fa67fb5bf6f103ff9e4303d5 | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Dec 13 16:34:53 2016 +0000 |
| committer | Ivan Podogov <ginkage@google.com> | Tue Dec 13 17:55:14 2016 +0000 |
| tree | a3c0185917dab9868de1979b51165e7f2cea4bc1 | |
| parent | eb0a34f26bcfde0c4cb506a8c7261efd3cc40f62 [diff] | |
| parent | b1e2da7c24613ce393bca871069d379cd4378c26 [diff] |
resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp Test: build police Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b