OSDN Git Service

am c6ada3b1: (-s ours) am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 05:12:59 +0000 (05:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:12:59 +0000 (05:12 +0000)
commitd1bba9da5143d5e398084b8c6bf5189b780734ab
treef07b202ea380fb956bc11373d8993a1015b55f60
parente21a347e9b905764c79338de31b990d131a8c62d
parentc6ada3b169827f581cd61749c6056c4209ebb650
am c6ada3b1: (-s ours) am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."

* commit 'c6ada3b169827f581cd61749c6056c4209ebb650':