tree eaf3c24d159db426643b15e99ff8a5569f444198
parent e8d7b84a25a24d0e4d4abce251bb17fd46666b40
parent bfee61bf28ea72b67a41f4e0c2c6f739f3928ee3
author Tao Bao <tbao@google.com> 1474941054 -0700
committer Tao Bao <tbao@google.com> 1474941315 -0700

resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp

Change-Id: I30660f468c9b4d99ec51d5973e3733d892cb763c