OSDN Git Service

Merge "Revert accidential merge afe6320d70f46e8af724ef2cde86a5963d198868"
authorPhilip P. Moltmann <moltmann@google.com>
Wed, 15 Feb 2017 21:37:30 +0000 (21:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Feb 2017 21:37:35 +0000 (21:37 +0000)
commit8accbf42a62df9e7962f079c213c86f928e01aa7
treecf1ab99cbf029cabd4d72a7f6e4b5cac77018e33
parent6e6383026cf6816263b81b015778cc14ade7a9b3
parent5c449ae5ce48aa579605ae61cdbb6a2a1a961e05
Merge "Revert accidential merge afe6320d70f46e8af724ef2cde86a5963d198868"