tree da415c972694690d6486c6dabee9ba1c074c342c
parent 75c7c5ae287e79e8502bc9e23853ff64def8e8bf
parent f7f8cf5743810a614079ff7d4202dd0c9cd969ed
author Sunny Goyal <sunnygoyal@google.com> 1454102517 +0000
committer android-build-merger <android-build-merger@google.com> 1454102517 +0000

Merge "Fixing Test builds" into ub-launcher3-burnaby-polish
am: f7f8cf5743

* commit 'f7f8cf5743810a614079ff7d4202dd0c9cd969ed':
  Fixing Test builds