diff options
| author | Sreeram Ramachandran <sreeram@google.com> | 2014-12-17 19:44:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 19:44:54 +0000 |
| commit | b3d1c78c63fec29570efa39565155c0a03fb6147 (patch) | |
| tree | d7a92a6fb2fc8398c42acb509875b3dff372d023 | |
| parent | e4eb666925e54e22456c101c2e7f19c982c0bb7c (diff) | |
| parent | 43e459a234df420806d30bd5613464eedc25ece7 (diff) | |
| download | android_external_android-clat-b3d1c78c63fec29570efa39565155c0a03fb6147.tar.gz android_external_android-clat-b3d1c78c63fec29570efa39565155c0a03fb6147.tar.bz2 android_external_android-clat-b3d1c78c63fec29570efa39565155c0a03fb6147.zip | |
am 43e459a2: resolved conflicts for merge of 2008e147 to lmp-mr1-dev-plus-aosp
* commit '43e459a234df420806d30bd5613464eedc25ece7':
Cleanup: Remove unused "ipv6_local_address".
0 files changed, 0 insertions, 0 deletions