tree a21e696768db4849ed8a2e9d68655dc2ce80bb54
parent c5ba0110d4032df96124f36ed3ff70e71a2fd52f
parent 3b435625351e5073bd4408319777ea0d4b677529
author Greg Kaiser <gkaiser@google.com> 1468282668 +0000
committer android-build-merger <android-build-merger@google.com> 1468282668 +0000

Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b
am: 3b43562535

Change-Id: Ifc19df587c4f0ef993200fdb6757fe3f3813bc67