OSDN Git Service

resolved conflicts for merge of a2407de1 to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)
Change-Id: Iaf366cec9606c8fed79ec00ac2573f2298de199c


Trivial merge