tree abb8e64b560971d648c015b5832d3e5285077be5
parent 397c33292ba87035e71ac95f0efddb27f6fab57d
parent 63b95e3f32fb11d27b894c65dcd48877fe0528a7
author Narayan Kamath <narayan@google.com> 1418037680 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1418037682 +0000

Merge "Fix CTS build on AOSP/master"