OSDN Git Service

Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev
authorFilip Gruszczynski <gruszczy@google.com>
Fri, 5 Jun 2015 16:59:44 +0000 (16:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 Jun 2015 16:59:48 +0000 (16:59 +0000)
commiteb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b
treeacd942ff663ba1510cc26367e3cfca60a2b99247
parente1352de673423264c00c71c0ec1597bbdad6fd03
parentb0c673b50e75cb9d931156d4e09e9628ba3caec1
Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev