OSDN Git Service

am fcecc4e9: am da56bea4: (-s ours) am 4a368659: Merge "Fix issue #22414729: Checkin...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 18:16:02 +0000 (18:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:16:02 +0000 (18:16 +0000)
* commit 'fcecc4e95fbbd8a35938ad3c752d104b9dac4872':


Trivial merge