OSDN Git Service

Merge "resolved conflicts for merge of 15621f64 to mnc-dev-plus-aosp" into mnc-dev...
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 11:38:01 +0000 (11:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Jun 2015 11:38:01 +0000 (11:38 +0000)

Trivial merge