tree f42e0411d9f5506d1c0cd3f20b1d76d831b24c94
parent 2f8a8b8a188bd3e974c2d2a3dc8048512c297c55
parent 7a5397dd6558748f3128d9b81e462cb9e3f75c69
author Ryan Longair <rlongair@google.com> 1512706010 +0000
committer android-build-merger <android-build-merger@google.com> 1512706010 +0000

resolve merge conflicts of e4f77886611d1b4f8b5018dc6d4cc027da0a77a6 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496  -s ours am: 3288f0cabb  -s ours
am: 7a5397dd65  -s ours

Change-Id: I197aa79c91c786dc2751e071361374a35ab3e4e7