OSDN Git Service

resolve merge conflicts of 46bb678 to nyc-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Fri, 6 May 2016 23:22:28 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 23:22:28 +0000 (23:22 +0000)
commit0b8d835fd92018fe21fe41ed35a63ab99f722fa0
tree79f692c4e632932916a0b76f6ca01442ffd5d51b
parenteed2222d6bb06dfbeba3d764c02854740c749fe7
parent3b1e7aa3eac79edf306fddf13c09e0c3a84d26c7
resolve merge conflicts of 46bb678 to nyc-dev-plus-aosp
am: 3b1e7aa3ea

* commit '3b1e7aa3eac79edf306fddf13c09e0c3a84d26c7':
  Fix linker crash on trying to unload main executable

Change-Id: Ia3f865e66759da40240c6c662655559d77079368