tree 50c787017072a1f8d39f3f004c07643e32fc9c8f
parent c3f7cf7f1b8987a873ceea8c1b45206dd611e425
parent 2a923c92869efb277ca7d67ab6c27617ec26c128
author Glenn Kasten <gkasten@android.com> 1461195645 +0000
committer android-build-merger <android-build-merger@google.com> 1461195645 +0000

Merge "Disable warnings that are not easily fixable" am: 8192b1a
am: 2a923c9

* commit '2a923c92869efb277ca7d67ab6c27617ec26c128':
  Disable warnings that are not easily fixable

Change-Id: I920b16bdaa1ce7a00c91e129b950f0d486a1fa37