OSDN Git Service

resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:44:18 +0000 (22:44 -0700)
committerTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:46:04 +0000 (22:46 -0700)
commit377f5944f6814eaec973022e9a5ac06afe076d8b
tree4790460189b4f57f4d7404a9610b9124473754c5
parent707c4ae757322efd04d9dd7b75bd31135b73bcf7
parentfb45739c55b0517f787c951862f7e1378292e6b3
resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp

Change-Id: I2e867189d4f827935a4ab8af6d5c1856a8413be0