resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)
commitf47f5ecf0bb0e0be66ce5bb85edbb9a0bb6da089
tree4e5a88e0f5c166fe3437b5f9e12871a7337559fa
parent29fce3bfffd8c4f07a9ffff95dc23d44b8a8b623
parent0d151184d5306744cf10bfb902c0a8bfbf3f29e6
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
am: 0d151184d5

Change-Id: I25450768dbdbadf87b17e51453a64c7f7ac7a433