OSDN Git Service

am 4ac79e44: (-s ours) am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 23:47:21 +0000 (23:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 23:47:21 +0000 (23:47 +0000)
* commit '4ac79e44d35afbc5da451cfefb48da4c62a96bbf':


Trivial merge