tree 60d71fde3752b537ddb07f5b985bd9799bbb5518
parent a7b8837b4064255ecc1087a62b0a1d683ca09c86
author Hall Liu <hallliu@google.com> 1500683413 -0700
committer Hall Liu <hallliu@google.com> 1504039779 -0700

Change some variable names to match up with framework

Bug: 30981736
Test: testapps
Change-Id: I1ce28429d35f04f24895195e7d4b7c22f29a2199