| commit | 5c18832c75bd0bb3de492c2583087ef15cc962b5 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue May 19 03:14:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 19 03:14:38 2015 +0000 |
| tree | 281bfaf58eac505a8e5e0d04b39c15ae2e44325d | |
| parent | e00a5b6358776b4f3003407f6e7fadb0347cc1e2 [diff] | |
| parent | 7e7341f662e7cd25054b11a858a8e1137000b4e0 [diff] |
am 7e7341f6: resolved conflicts for merge of c434f71b to mnc-dev-plus-aosp * commit '7e7341f662e7cd25054b11a858a8e1137000b4e0': Update device to use set_prop() macro