OSDN Git Service

am bc90e171: am b18c2c42: (-s ours) am 7bd8e6a8: DateTimeView: don\'t assume you...
authorDan Sandler <dsandler@android.com>
Thu, 27 Aug 2015 19:02:19 +0000 (19:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:02:19 +0000 (19:02 +0000)
* commit 'bc90e171337fbaf10879f47703d6f7133f1b6089':


Trivial merge