resolve merge conflicts of b172f9e to master
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 20:03:34 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 20:03:34 +0000 (20:03 +0000)
commit657bfbfb71b75b63d7ab78afa50ec321bd5f0b06
tree0f4089d00ecffb9fc8a583498999741a8a5be26b
parent6140614e6dd113553e7cd1c5280a13035c890900
parented8e08ff826eb42e5d524d0b581d6d9b516b4898
resolve merge conflicts of b172f9e to master
am: ed8e08ff82

Change-Id: I87eea013265484e330874608de507e8f6c193e02