OSDN Git Service

Merge "resolve merge conflicts of 7d1428d7f3 to master."
authorQiwen Zhao <zhao@google.com>
Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)
commit4f78bca7814e0a3c4954d325597479aeb313c941
tree590dfa05558941d9612015df77054ffd0f22cfb1
parent76415ee5008a60e015a2861f75de3a44f60741cc
parent17b1c2cf9a2e049ca1f2e4839c4cfaba6028d1fc
Merge "resolve merge conflicts of 7d1428d7f3 to "