OSDN Git Service

Merge "resolved conflicts for 389bb7f5 to master"
authorTodd Kennedy <toddke@google.com>
Fri, 25 Sep 2015 22:58:27 +0000 (22:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 25 Sep 2015 22:58:27 +0000 (22:58 +0000)
commitf36f4f584555e0a4edac5489f758a488218f9b8b
treedbc81e2fb7acb54a3b3c2e3b8e21ccb7b5d4f54e
parentcf2bb175bb3c9cbf7757e91907a8676a23567fda
parent56ebb257085ffed21c98ba98ced959ffe6afaca3
Merge "resolved conflicts for 389bb7f5 to master"