OSDN Git Service

am 19b7517f: (-s ours) am c3075c38: am 82223508: am 26862c30: Update bottom controls...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
* commit '19b7517f812dbadc6b58f88daf8e2152ad1bde58':


Trivial merge