OSDN Git Service

resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000 (14:56 +0200)
committerSebastien Hertz <shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000 (14:56 +0200)
commit30bec90cc47aa16c23161d65d062e1fa87157b76
tree06b471eded9b5b87b322f5dcd20338f223b0e6f5
parentc3880a4713a543763e8f54aaf72cde73c8cd8bfb
parent5ee9454dfee08a70dec62b0ed0fd4ad274274937
resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp

Change-Id: I631e6ebdbc5e7abc571de133b337309ed08282e3