OSDN Git Service

am b7fed7eb: (-s ours) am 6589fee1: am 6df1d46a: Merge "Revert "Revert "Revert "Fixes...
authorCalin Juravle <calin@google.com>
Thu, 27 Aug 2015 04:06:32 +0000 (04:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:06:32 +0000 (04:06 +0000)
* commit 'b7fed7eb4badadfb37c6894e24fc7c61c212ba1e':


Trivial merge