OSDN Git Service

am 902e09d4: resolved conflicts for merge of 966611a9 to master-nova
authorBrian Carlstrom <bdc@google.com>
Mon, 12 May 2014 23:25:37 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:37 +0000 (23:25 +0000)
* commit '902e09d43a6c6f9db6b4db4145fdea8b757be05f':


Trivial merge