OSDN Git Service

am 5ae9de3a: (-s ours) am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 23:39:39 +0000 (23:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 23:39:39 +0000 (23:39 +0000)
* commit '5ae9de3a241f7549c1ab8ea5e687c5b263aa0623':


Trivial merge