tree 733500b67354f1fd924b9c3df823fe38ccd238dd
parent 08b51bfe8532ab7eff38ad69ad46c251be5c2792
parent edf44562b51610ced0bb0d4bc24adcfafcf74502
author Rich Slogar <rslogar@google.com> 1430428812 -0700
committer Rich Slogar <rslogar@google.com> 1430428812 -0700

resolved conflicts for merge of edf44562 to mnc-dev

Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676