OSDN Git Service

Merge "resolve merge conflicts of 8ec7028 to master"
authorSalvador Martinez <dehboxturtle@google.com>
Wed, 7 Sep 2016 18:02:11 +0000 (18:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Sep 2016 18:02:12 +0000 (18:02 +0000)
commit55e738aa03b523722541455ae43651c47b55231a
tree3d13c4d523c163f7845d6371db8f2810934f9f70
parentc2d59c066618843399cb1093f8f70ed3e69bc9b1
parent923534f6414a9b69a40d9eb6ce5727a110b8e8d7
Merge "resolve merge conflicts of 8ec7028 to master"