OSDN Git Service

Merge remote-tracking branch 'goog/mnc-dev-plus-aosp' into mm
authorElliott Hughes <enh@google.com>
Fri, 8 May 2015 19:41:12 +0000 (12:41 -0700)
committerElliott Hughes <enh@google.com>
Fri, 8 May 2015 19:41:12 +0000 (12:41 -0700)

Trivial merge