OSDN Git Service

Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev
authorJeff Brown <jeffbrown@google.com>
Fri, 21 Nov 2014 21:48:46 +0000 (21:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Nov 2014 21:48:47 +0000 (21:48 +0000)

Trivial merge