OSDN Git Service

Merge "resolve merge conflicts of 23f196f347b7 to master"
authorAndrew Sapperstein <asapperstein@google.com>
Mon, 24 Apr 2017 19:50:40 +0000 (19:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Apr 2017 19:50:48 +0000 (19:50 +0000)
commit9bf6c8a28f1ad858e032e43e398a9a4e6fd02bd8
tree35eb29152805ec879a0ac53fc0276bd06d1748e4
parent4320abafac030db043c4a6ce2e214f4d877f75a1
parentf945f521d1f8c1b2d23fdee70fb424e74b93c4ed
Merge "resolve merge conflicts of 23f196f347b7 to master"