OSDN Git Service

am 35d0e532: (-s ours) am f59798e3: am d2ddfd29: (-s ours) am d88b2e76: am ad5614a1...
authorYu Ning <yu.ning@intel.com>
Thu, 27 Aug 2015 10:51:57 +0000 (10:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:51:57 +0000 (10:51 +0000)
* commit '35d0e53294b5fc0b463dec669f1c975fcf2b14f0':


Trivial merge