OSDN Git Service

resolved conflicts for merge of a2ea7405 to mnc-dev-plus-aosp
authorVladimir Marko <vmarko@google.com>
Mon, 1 Jun 2015 14:54:09 +0000 (15:54 +0100)
committerVladimir Marko <vmarko@google.com>
Mon, 1 Jun 2015 14:54:09 +0000 (15:54 +0100)

Trivial merge