tree 0b016a65aa9931b35161fc5af134dd3fb41aab54
parent abed6edc4d35b45801f593668473e94a8cbe885c
parent 047db5285179873e1e841b69fd6321a96b265d98
author Elliott Hughes <enh@google.com> 1449532784 +0000
committer android-build-merger <android-build-merger@google.com> 1449532784 +0000

Merge "Track rename of base/ to android-base/." am: 316a0dd842 am: e2a9563be1
am: 047db52851

* commit '047db5285179873e1e841b69fd6321a96b265d98':
  Track rename of base/ to android-base/.