| commit | 4e41767977257a2b949f95a7ecb9b7ab4d1cdf10 | [log] [tgz] |
|---|---|---|
| author | Cedric Ho <cedricho@google.com> | Mon Apr 27 13:16:18 2015 -0700 |
| committer | Cedric Ho <cedricho@google.com> | Mon Apr 27 13:16:18 2015 -0700 |
| tree | 53e56211e870c3f0bbb1d03425885603ee00cc27 | |
| parent | 580c30a63353f67433da25ef7b90913300e0372f [diff] | |
| parent | 0af3af0397cb6a92ea140736e84f7484ce029071 [diff] |
resolved conflicts for merge of 0af3af03 to mnc-dev Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f