tree 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f
parent ca69393b8f54e0cd38d876547a0d82e641951798
parent 1cff6731f916e07dc13ab4765d480c87ee590cd7
author Elliott Hughes <enh@google.com> 1463176259 -0700
committer Elliott Hughes <enh@google.com> 1463176259 -0700

resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp

Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239