OSDN Git Service

Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
authorLorenzo Colitti <lorenzo@google.com>
Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)
commit03cbc81f3279e051faee176d83b030b50708e74b
tree3c7ab21919bf9e534e76874f51052f10e416e59d
parent54ec71200b5ea29f88e07e6a29312ec5a55bc54b
parentbb529c267d5ce451f26945e52664c5ce48185db5
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331