OSDN Git Service

am a3758bbe: (-s ours) am 115c6b1d: service: Remove local copies of base and modp_b64
authorArman Uguray <armansito@google.com>
Thu, 27 Aug 2015 10:54:46 +0000 (10:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:54:46 +0000 (10:54 +0000)
* commit 'a3758bbe11bab4d30d7c8c8b90e1f22f2915d276':


Trivial merge