OSDN Git Service

Merge "resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp" into lmp-dev...
authorAndreas Gampe <agampe@google.com>
Thu, 2 Oct 2014 06:36:41 +0000 (06:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Oct 2014 06:43:47 +0000 (06:43 +0000)

Trivial merge