tree e678fcfaf7011a95a64e9d6b9a63538502e4d75b
parent 20bb31bbd3a74667ff1da59ef4ead37d065dc80d
parent 038c294453865161680777f08ce7adbf42d8f6e3
author Tao Bao <tbao@google.com> 1457123310 +0000
committer android-build-merger <android-build-merger@google.com> 1457123310 +0000

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

* commit '038c294453865161680777f08ce7adbf42d8f6e3':
  Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.