OSDN Git Service

Merge "resolve merge conflicts of 0ee60c0 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 15 Sep 2016 00:01:16 +0000 (00:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Sep 2016 00:01:17 +0000 (00:01 +0000)
commit6a435bbb614b59bb89acc89898ea8eb3192c25d7
tree1e4ef84cd566ab964a6672ce67e91a8353f88412
parent818d7e86755f5a76c2a81f55ee5c336c02b364d4
parent661248cf3ef75cc4ac99e9b3a027e966c6c7dca2
Merge "resolve merge conflicts of 0ee60c0 to master"