tree a7fd37681876afa17e01a04cc08a5c50741f3828
parent 0eded2ae7f38aef9ffaff4f41081851aafebb073
parent 06ca938ce22681455bf75f0b6282b776814df30e
author Elliott Hughes <enh@google.com> 1449272619 +0000
committer android-build-merger <android-build-merger@google.com> 1449272619 +0000

Merge "Track rename from base/ to android-base/."
am: 06ca938ce2

* commit '06ca938ce22681455bf75f0b6282b776814df30e':
  Track rename from base/ to android-base/.