tree f21d039e4ea3e32bd41fae31a9ca4cc4b430eeb5
parent e96a44e26ccd6de17cbfabe38613c5b215d9ad56
parent a742d1027784a54c535cff69b375a9f560893155
author Sami Tolvanen <samitolvanen@google.com> 1465944940 -0700
committer Sami Tolvanen <samitolvanen@google.com> 1465944940 -0700

resolve merge conflicts of a742d10 to nyc-dev-plus-aosp

Change-Id: Icf3257ee8a47f31ba812a5f47899b8022f4eedb7