OSDN Git Service

am dc9751ce: am 30e8a36d: (-s ours) am ad4a285a: am ebac4d1b: Merge "Change condition...
authorMathieu Chartier <mathieuc@google.com>
Thu, 27 Aug 2015 17:04:50 +0000 (17:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:04:50 +0000 (17:04 +0000)
* commit 'dc9751ce543cff248896411fb17ad09cd1d27477':


Trivial merge