OSDN Git Service

Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev
authorBryce Lee <brycelee@google.com>
Thu, 23 Oct 2014 00:05:41 +0000 (00:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Oct 2014 00:05:42 +0000 (00:05 +0000)

Trivial merge