| commit | f29e787611a91533a904ab640df80c1643a0adc7 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon May 11 11:29:43 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Mon May 11 11:29:43 2015 -0700 |
| tree | 97f1e71f01c1ecd3495e9b5edf65a3124d58ddc7 | |
| parent | 1c069641b40a3c8e535e20e06abafacc9c62549c [diff] | |
| parent | 901d792cbfa65915b9cdf79fcbb4055eb0f29282 [diff] |
resolved conflicts for merge of 901d792c to mnc-dev-plus-aosp Change-Id: I63fbc397ba28c832857bf7e27e8f1798e789a6e1