| commit | b3d1c78c63fec29570efa39565155c0a03fb6147 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed Dec 17 19:44:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 19:44:54 2014 +0000 |
| tree | d7a92a6fb2fc8398c42acb509875b3dff372d023 | |
| parent | e4eb666925e54e22456c101c2e7f19c982c0bb7c [diff] | |
| parent | 43e459a234df420806d30bd5613464eedc25ece7 [diff] |
am 43e459a2: resolved conflicts for merge of 2008e147 to lmp-mr1-dev-plus-aosp * commit '43e459a234df420806d30bd5613464eedc25ece7': Cleanup: Remove unused "ipv6_local_address".