tree 24b57a5ceeb10bb13a0522f414f09f3fcf6fe59c
parent 22a496cabd1e6d36dbf8a5acb3c57f39335148ca
parent c21980bc12db67c763a18b1abaa3ddd3689b1687
author Elliott Hughes <enh@google.com> 1449279935 +0000
committer android-build-merger <android-build-merger@google.com> 1449279935 +0000

Merge "Track rename from base/ to android-base/." am: f31cf3ab0f
am: c21980bc12

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