OSDN Git Service

am 63cd28af: (-s ours) am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 10:02:46 +0000 (10:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:02:46 +0000 (10:02 +0000)
* commit '63cd28afc398a8f26dc3eed0404ff8f26b04a5c6':


Trivial merge