OSDN Git Service

resolved conflicts for merge of 6425b37b to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 13:14:29 +0000 (14:14 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 13:14:29 +0000 (14:14 +0100)
Change-Id: I5bc20d3bf1db1e190ff9d21abc81bdf5dbeffa9f


Trivial merge