resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)
commit0d151184d5306744cf10bfb902c0a8bfbf3f29e6
tree0f4089d00ecffb9fc8a583498999741a8a5be26b
parent895dcf4469fff08352335b726675cf0a33177498
parent8afe1d6b23dd356b8298b429666a041cdecb3437
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp

Change-Id: I590938d9af1d9d7071a6c256d38c2e5d006c1e7e