OSDN Git Service

Merge "resolve merge conflicts of cf85fd5 to stage-aosp-master" into stage-aosp-master
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 15 Jul 2016 23:51:04 +0000 (23:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 23:51:05 +0000 (23:51 +0000)
commit22d5ddcb955cd5a20bec750effc62343a3b2f415
tree5854f3a3c011b17a50e66b86ead539eb72e42702
parent476950d104b31e3b22bea5ed207b3febbaa0f99b
parent268a9f41610a6b49d3ead9e6cabca1ea6da87afc
Merge "resolve merge conflicts of cf85fd5 to stage-aosp-master" into stage-aosp-master