resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)
commitcc191e57bfb8c4021fbb6c4008557a62d19b74ce
tree4e5a88e0f5c166fe3437b5f9e12871a7337559fa
parent6f7cf16a639ef31b9835ef745e29526cd196b6cc
parent29baf28a2fbcb499854fcc863849637057d4d303
resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71
am: 29baf28a2f

Change-Id: Ic5e033debdc6cafba026c9f40efaab8c4f83f746