OSDN Git Service

resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp
authorRoland Levillain <rpl@google.com>
Mon, 29 Jun 2015 13:28:23 +0000 (14:28 +0100)
committerRoland Levillain <rpl@google.com>
Mon, 29 Jun 2015 13:29:02 +0000 (14:29 +0100)
Change-Id: Id084ba7a4c95479696b0b414dbd29a68b9e7d02c


Trivial merge