tree f21d039e4ea3e32bd41fae31a9ca4cc4b430eeb5
parent 9f2c0ffaf53742612a3dd7cc9415a5aff17f214a
parent b2ed83301e3df782c2c3985dcf7eefeb15ec941a
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