tree 165f4271b40ec83c8e9893f88f7383e370e73ed1
parent f6ffefb11690ca3604df7c8c0ddda74387d26eba
parent f639490a51655a4d372663e2f7000666748d7fda
author Tao Bao <tbao@google.com> 1457123159 +0000
committer android-build-merger <android-build-merger@google.com> 1457123159 +0000

Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."
am: f639490a51

* commit 'f639490a51655a4d372663e2f7000666748d7fda':
  Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.