OSDN Git Service

am 35fe7782: am b8719e27: (-s ours) am 49fcfdd4: Merge changes I9c294329,Ie4db5d28...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 18:25:59 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:25:59 +0000 (18:25 +0000)
* commit '35fe7782d7c58b5d233458e3002c1ac808025161':


Trivial merge