tree 43d2761b733c9c590b410a26198cdb06a61e93e6
parent baa4b83e31249104a974f1ceb5161dd5e4e483f4
parent bf76d2c35ef38bd34f7f8fc3951517beb4187087
author Mark Salyzyn <salyzyn@google.com> 1470687035 -0700
committer Mark Salyzyn <salyzyn@google.com> 1470687035 -0700

resolve merge conflicts of 5f6dbd9 to nyc-mr1-dev-plus-aosp

Change-Id: Ia85ca9ea4c38d270229af394c351b7b31ea2057e