tree c55bd770e0b7b5797ac992bf21bf7501a3c9e630
parent d8024ab0a038fddb82e77aed15fe14c253321b56
author Bo Liu <boliu@google.com> 1410814351 -0700
committer Bo Liu <boliu@google.com> 1410968634 -0700

Compile fix for cherry-pick

Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

BUG: 17354106

Change-Id: I3e07ab4bfd36c17ce006a73f44402251d5c83138