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