OSDN Git Service

Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp...
authorDan Stoza <stoza@google.com>
Tue, 27 Jan 2015 20:06:33 +0000 (20:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jan 2015 20:06:34 +0000 (20:06 +0000)

Trivial merge