OSDN Git Service

resolved conflicts for merge of 53cb9daa to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 24 Jun 2015 16:54:40 +0000 (17:54 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Wed, 24 Jun 2015 16:54:40 +0000 (17:54 +0100)
Change-Id: I4c205a5d152968d9076c21df7282ff643715a8a3


Trivial merge