| commit | 3cad510e271d4e9510d0f15560c4979071c8436c | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 29 19:34:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 19:34:32 2014 +0000 |
| tree | d96d48db0416cdf5564d52ab472ee5820d2ea373 | |
| parent | 78b3f5ab70300548776e3b98ee6d8fb6b1f5318f [diff] | |
| parent | 4ed472ab33e78391c0b084ed3908019e06b7dfe5 [diff] |
am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master * commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5': Suppress Clang compilation warnings.