OSDN Git Service

Merge "resolved conflicts for merge of 18218b8b to mnc-dev-plus-aosp" into mnc-dev...
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 13:09:09 +0000 (13:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Jun 2015 13:09:10 +0000 (13:09 +0000)
commitdb902f946a749a09b8abfa9e24a4c33321de6001
tree89d4c759931ceef6f4145bb052baefad868cbbed
parent3fd510a3c11449db8c4032017212238114dab866
parentb3bec94c3104056eff7f5976a64a2655b782b2bb
Merge "resolved conflicts for merge of 18218b8b to mnc-dev-plus-aosp" into mnc-dev-plus-aosp