OSDN Git Service

am 200e0b53: (-s ours) Merge "Revert "Revert "Update for libbase."""
authorDan Albert <danalbert@google.com>
Mon, 16 Mar 2015 22:39:22 +0000 (22:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Mar 2015 22:39:22 +0000 (22:39 +0000)
* commit '200e0b53817227453418a432b1384792c1bc29da':
  Revert "Revert "Update for libbase.""


Trivial merge