OSDN Git Service

Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into...
authorxinhe <xinhe@google.com>
Wed, 19 Nov 2014 22:50:41 +0000 (22:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Nov 2014 22:50:43 +0000 (22:50 +0000)

Trivial merge