tree 2bd1540854c5026212e87364d8ce4c0779097d62
parent 00537955f21a65f7ff9e3ea7cf2113009b560254
parent 5d409ace19fa1d8d14d099c63f04ba45e4d578a8
author Alexey Polyudov <apolyudov@google.com> 1486063866 +0000
committer android-build-merger <android-build-merger@google.com> 1486063866 +0000

resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
am: 5d409ace19

Change-Id: I90f8afee357fa453e337b657976a1619383a58a5