OSDN Git Service

Merge "resolved conflicts for merge of 4f342e87 to master"
authorJeff Tinker <jtinker@google.com>
Fri, 4 Apr 2014 00:30:27 +0000 (00:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Apr 2014 00:30:28 +0000 (00:30 +0000)
commit8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a
tree4aac669d5768f0caa3c1e6eb4b2ebbc5d7dbd555
parented3db02c051f52f9ad3770e3c6b5b90c71a04fb1
parent9de8c1d82b6bf2b70e854a3349c9f1da60a23e83
Merge "resolved conflicts for merge of 4f342e87 to master"