OSDN Git Service

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


Trivial merge