OSDN Git Service

am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master
authorNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 19:34:32 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 19:34:32 +0000 (19:34 +0000)
commit3cad510e271d4e9510d0f15560c4979071c8436c
treed96d48db0416cdf5564d52ab472ee5820d2ea373
parent78b3f5ab70300548776e3b98ee6d8fb6b1f5318f
parent4ed472ab33e78391c0b084ed3908019e06b7dfe5
am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master

* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.