OSDN Git Service

resolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Tue, 29 Nov 2016 09:36:52 +0000 (09:36 +0000)
committerNarayan Kamath <narayan@google.com>
Tue, 29 Nov 2016 09:36:52 +0000 (09:36 +0000)
commit2df9dc0a00bbb37e05ac7add3226066c16780c10
treee4a575f9a518fa117a5bfcf24995c0d5ef4b90b3
parent8378b7f6f29e69545ef8c265d9d5ee93d6ffb67d
parent3069899688d42d372d860d06f592aa53678baae2
resolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp

Change-Id: I4fc296d7e1cf36be40a1aadffd663df4fea5f521