OSDN Git Service

am fcb005d1: (-s ours) am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2...
authorSebastien Hertz <shertz@google.com>
Thu, 27 Aug 2015 10:41:55 +0000 (10:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:41:55 +0000 (10:41 +0000)
* commit 'fcb005d1c8b8aea6581eb40cb34b6016a4389968':


Trivial merge