OSDN Git Service

am 09002879: am 8b679bfa: (-s ours) am 3551a59b: Merge "Work on issue #21516866:...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 18:44:15 +0000 (18:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:44:15 +0000 (18:44 +0000)
* commit '09002879a59cf9ac46febe76a51afd84640a80d5':


Trivial merge