tree 64d17f70a11a261ea1ea22cf5907a502f6dbbfa7
parent eca06f11862f7225346e7d2a758178e308e89475
author Ang Li <angli@google.com> 1403025980 -0700
committer Ang Li <angli@google.com> 1403026821 -0700

Fix make file to fix build
Fix a bug in android_device

Merging kwd commit 5861bf1edda18872676d02749794ed64da67dfc8
Change-Id: Id063ea653f47c7743102c912a8480c0410df6465