OSDN Git Service

resolve merge conflicts of 1fe8749 to nyc-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 4 Oct 2016 02:45:22 +0000 (19:45 -0700)
committerElliott Hughes <enh@google.com>
Tue, 4 Oct 2016 02:45:22 +0000 (19:45 -0700)
commit6b8d4dfcf8bc100a41325bf85d1912ca61036d4d
tree98133eeeb0e10e60cb382cb4634fa77f5a771654
parent76cfe2b54a85ee7a2d5bb7cbb313e5f72aa6139c
parent1fe87497921e06364c9ecfe48438e9bcc0c73498
resolve merge conflicts of 1fe8749 to nyc-mr1-dev-plus-aosp

Change-Id: I9ff1a93ff1185cb9cc5377ec2848687a45f8f8de