OSDN Git Service

Merge "resolve merge conflicts of b53d984 to master"
authorAlex Klyubin <klyubin@google.com>
Thu, 22 Dec 2016 20:56:56 +0000 (20:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Dec 2016 20:56:59 +0000 (20:56 +0000)
commit3a8eac544bafa6256030171fc3ebbd739a02d553
treec33157954f047a775ba3987b9474bc0ad5e4666d
parent3070dbfae67ab5a1fe9597bac1a196c413f8e310
parentf271c6d266f37d600b65ada8e4e4a32d5044a49a
Merge "resolve merge conflicts of b53d984 to master"