tree 4537c974d005a76263f067516c18ba8cb93d4cbb
parent 713ad360c41ff82ab471fd713f1dccfe16c5605b
parent 09ab9a68387bb17b998c42cf1e45dfeab7f70fa3
author Tao Bao <tbao@google.com> 1476048397 -0700
committer Tao Bao <tbao@google.com> 1476048646 -0700

resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp

Change-Id: Ifc0b085d8384f373ffffc14abd907227961efdf9