tree 11790a7ce66c7459763b5bd919018672209d79bc
parent 904f84d8cf06a80becc612665cafa116d6ee0bd3
parent 2cde259195a31c270adf9ea5208353c3803a4364
author Elliott Hughes <enh@google.com> 1450294723 +0000
committer android-build-merger <android-build-merger@google.com> 1450294723 +0000

Merge "Silence warnings."
am: 2cde259195

* commit '2cde259195a31c270adf9ea5208353c3803a4364':
  Silence warnings.