tree f806ca96cf3d4fcb627bb283e1f56c279a51c9f4
parent da21859d3d98f00ee4a1f86b3ff918d06607a2d3
parent ff4c2c07e899ab049c7499f2818cd8a45e0213d3
author Elliott Hughes <enh@google.com> 1449276943 +0000
committer android-build-merger <android-build-merger@google.com> 1449276943 +0000

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

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