OSDN Git Service

resolve merge conflicts of 9ce09e4 to nyc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 29 Mar 2016 18:27:27 +0000 (11:27 -0700)
committerElliott Hughes <enh@google.com>
Tue, 29 Mar 2016 18:27:27 +0000 (11:27 -0700)
commit4aeb851c8f1a8fe86ca0f7eb5a0f8d23f609218e
tree79e5c4150c00c1289fda88bfce3b26ad7b8aa57e
parent348eae40c2bdf7edec900483ec9e3669ab5a4b94
parent9ce09e423f24823d52f19ab8247e078977100132
resolve merge conflicts of 9ce09e4 to nyc-dev-plus-aosp

Change-Id: I0b5ac686e45c685e5168a0870570589e2eb82488