tree e146cd87948eb11eb195d463b49dc8b1bdeb0db0
parent 76f2c1ef62b23c5d85f36d3a695ac50c2df89d05
parent aee749445619dd678094e416527b43d39d763bd8
author JP Abgrall <jpa@google.com> 1393014876 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393014876 +0000

am aee74944: am 823435f7: Merge remote-tracking branch \'upstream_linaro/linaro-libnl2_0\'

* commit 'aee749445619dd678094e416527b43d39d763bd8':