tree 1c65b4deedb72c2cf12b69dd40a4ad3820505ae7
parent 7cf7bc0956b876842191b193df46abdcc21384a8
parent 3bfc095f5373ca1756923f8aacdebdadc8ebd4ea
author Dan Willemsen <dwillemsen@google.com> 1456784249 +0000
committer android-build-merger <android-build-merger@google.com> 1456784249 +0000

Merge "Remove USE_NINJA=false"
am: 3bfc095f53

* commit '3bfc095f5373ca1756923f8aacdebdadc8ebd4ea':
  Remove USE_NINJA=false