OSDN Git Service

am 6953cdae: (-s ours) am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 23:47:29 +0000 (23:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 23:47:29 +0000 (23:47 +0000)
* commit '6953cdaebad1fad6f25dd9357409d70310cfd116':


Trivial merge