tree a849e01c61c4c5b56e24b872c9cef67cdf01a0b2
parent 2bdef0937ad3f77af84388a6f4e5456eaa6abd13
parent d29a16afc7918ee921a995950f31dd1d6be6823f
author Tao Bao <tbao@google.com> 1457123558 +0000
committer android-build-merger <android-build-merger@google.com> 1457123558 +0000

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

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