tree 0d19399288f2c41f7f5eb47eea0cb88b09ce537b
parent 765444d41c61b89e6612059764ac75d21cccdad6
parent 8b6f35abf2f280bd359d446998a272c21a4778a6
author Elliott Hughes <enh@google.com> 1479415162 +0000
committer android-build-merger <android-build-merger@google.com> 1479415162 +0000

Merge "Remove dead code."
am: 8b6f35abf2

Change-Id: Ib748fef3e54687c2da1818a7cd738f31e30b79ac