OSDN Git Service

am 8af367ec: (-s ours) am 00850ad5: am f378402b: (-s ours) am e40e60a6: DO NOT MERGE...
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 '8af367ec53ac6a9bdb071c5a2139a7a3289cc8cd':


Trivial merge