OSDN Git Service

am e8bdcc67: am 25a83393: am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
authorDan Stoza <stoza@google.com>
Thu, 11 Jun 2015 20:25:27 +0000 (20:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 20:25:27 +0000 (20:25 +0000)
* commit 'e8bdcc67c5b560212c9af3cfb6d922fcaecada91':
  sf: Add a NULL check in getDisplayConfigs


Trivial merge