tree 060b8526477594d891d2468412297f8b8ff75b16
parent 81c641f80cd8cc5c54d967cf2d39aee8ab8005a9
parent 90a968f0e3fb903aad41f6689c337a7e4a8d5c7b
author Nicolas Geoffray <ngeoffray@google.com> 1426505138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426505138 +0000

am 90a968f0: am dd581695: Merge "Revert "Create libbase.""

* commit '90a968f0e3fb903aad41f6689c337a7e4a8d5c7b':
  Revert "Create libbase."