tree 74744a31f6e175d775560e90cf897a1efec4d60f
parent e57850149166aac5390cb50cabfc01f41ddc2ef1
parent f05bd824665b2e6b1d952178e7ffdbe5346d6a31
author Filip Gruszczynski <gruszczy@google.com> 1435770182 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435770183 +0000

Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev