OSDN Git Service

resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000 (14:56 +0200)
committerSebastien Hertz <shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000 (14:56 +0200)
Change-Id: I631e6ebdbc5e7abc571de133b337309ed08282e3


Trivial merge