OSDN Git Service

Merge "resolve merge conflicts of 06b8324d02a5 to master"
authorAjay Panicker <apanicke@google.com>
Fri, 5 May 2017 00:14:43 +0000 (00:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 May 2017 00:14:49 +0000 (00:14 +0000)
commit6d48aa9827c3ef6ab651c39bdeab4faf8b522409
tree98a3b75e24fdb680a20cf84317c940b15ea90cbd
parent2f96131e200cc5d2f37f2bbf445b4a4c7aaab04e
parent0a3411a29be3510ebf51299312369aae9b2360ae
Merge "resolve merge conflicts of 06b8324d02a5 to master"