resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 19:17:32 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 19:17:32 +0000 (19:17 +0000)
commit47091c824b0b8771cafbd81255c93d2a1ba27e23
tree4e5a88e0f5c166fe3437b5f9e12871a7337559fa
parentcd345ef77f09cbbc705b01789501423f8aa0fb51
parentf47f5ecf0bb0e0be66ce5bb85edbb9a0bb6da089
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5
am: f47f5ecf0b

Change-Id: I8c6b0e792ca70866df83d96a6ce2cd6ef24e1f9f