tree 2577e80d8cac345ac5aec61d6af6d0e2d7c0c862
parent c8db4817809e163d887f7955a03ad0f97159f12b
parent d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5
author Elliott Hughes <enh@google.com> 1474919562 -0700
committer Elliott Hughes <enh@google.com> 1474919632 -0700

resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp

Change-Id: Ia041044547351a3e65b647bb9913aa18c7d2c97c