OSDN Git Service

am e66df909: (-s ours) am 82c66da0: (-s ours) am c2e98ca3: am 68ff174b: (-s ours...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 28 Aug 2015 00:05:10 +0000 (00:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 00:05:10 +0000 (00:05 +0000)
* commit 'e66df909b9e138d8254c1a5bb08fe79bf473aa69':


Trivial merge