OSDN Git Service

am 6f10aec6: (-s ours) am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
* commit '6f10aec6765021e7c022880786e3a24339b116f9':


Trivial merge