| commit | d872a513391eb63a41b9798900b6e4d621efa75c | [log] [tgz] |
|---|---|---|
| author | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 19:31:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 19:31:06 2017 +0000 |
| tree | 2bd1540854c5026212e87364d8ce4c0779097d62 | |
| parent | 00537955f21a65f7ff9e3ea7cf2113009b560254 [diff] | |
| parent | 5d409ace19fa1d8d14d099c63f04ba45e4d578a8 [diff] |
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp am: 5d409ace19 Change-Id: I90f8afee357fa453e337b657976a1619383a58a5