tree 6081eadfda15f2175aa8c4bec60c5c6adeb6502a
parent b0e3c001506c05e6e8264002663d64ec44311502
parent 7fb9934e6d74929c9182120890bac1495bfaebc3
author Chih-Hung Hsieh <chh@google.com> 1464390261 -0700
committer Chih-Hung Hsieh <chh@google.com> 1464390261 -0700

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

Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6