OSDN Git Service

am df45e1b2: (-s ours) am e836a229: Fix build.
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)
* commit 'df45e1b27d8eeeece9f95b6d80dab059297d1a60':


Trivial merge