tree 4176ebeae7dc2b640864859bf7cfeeecbfca3123
parent a09b65adae0f474eef3bf574dd5bc2297969eccf
parent ad8b5a6c1195b94d8d80671e1bf791c32008fbef
author Elliott Hughes <enh@google.com> 1473456211 -0700
committer Elliott Hughes <enh@google.com> 1473456211 -0700

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

Change-Id: Ib1453d1bf3c6b83ef47a383d9d171b1059240477