OSDN Git Service

am c97e8bbc: am 82bd3ae0: (-s ours) am 0ec43f89: Merge "Use correct user when filteri...
authorEsteban Talavera <etalavera@google.com>
Thu, 27 Aug 2015 16:41:20 +0000 (16:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:41:20 +0000 (16:41 +0000)
* commit 'c97e8bbc8b1c77be2c01ce5eaf6bc772cb3d9581':


Trivial merge