resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 17:16:53 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:16:53 +0000 (17:16 +0000)
commiteeb08c7a18ff867229277efd956002c8033b28cc
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parentd635a0dd0bb883b16f50be993d7d454ca931f196
parent921c48e50a89f51df5555e02f7fa6cb88a10d652
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
am: 921c48e50a

Change-Id: Id4b14e5d72cec816be24b5a403aaf932f5279ea9