OSDN Git Service

resolved conflicts for merge of f4e67434 to mnc-dev-plus-aosp
authorMingyao Yang <mingyao@google.com>
Fri, 19 Jun 2015 21:07:37 +0000 (14:07 -0700)
committerMingyao Yang <mingyao@google.com>
Fri, 19 Jun 2015 21:07:37 +0000 (14:07 -0700)
Change-Id: I2823f5bc5b4fc6989577c1ac6c55e9a71d47dd49


Trivial merge