OSDN Git Service

resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp
authorMarie Janssen <jamuraa@google.com>
Mon, 19 Dec 2016 18:31:10 +0000 (10:31 -0800)
committerMarie Janssen <jamuraa@google.com>
Mon, 19 Dec 2016 18:32:20 +0000 (10:32 -0800)
commit5e9774c1849a8ec77dc36ac381ce08bbca863817
tree7b240777593426b14ba4d5e0b86d125c2648a249
parent5c49897d8cbbe2605c3d78ce0ecf84debabb0dad
parentffcf88f36ec8412bc274a51cad3bf03c11c614fb
resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp

Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268