tree 94675ec498973e0a958cdc8b427e43696da580ac
parent eefdd1bf7eab5869d138b9b0a9c27e4201048d97
author Bo Liu <boliu@google.com> 1410970663 -0700
committer Bo Liu <boliu@google.com> 1411141096 -0700

Compile fix for cherry-pick

Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

BUG: 17354106
Change-Id: I49750d359f9ebdea493337d325bcae13ee82d64d