| commit | 1bb72b47300e8381432a7cc9eea583a8a0ec5dcb | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 21:20:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 21:20:24 2014 +0000 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | d9a706fbf242fa47b0dbfd7d6248f78a8cba9eff [diff] | |
| parent | 97b6a96d8ca7313413752e6369210a233dfe994d [diff] |
am 97b6a96d: resolved conflicts for merge of ab8f4f89 to klp-modular-dev-plus-aosp * commit '97b6a96d8ca7313413752e6369210a233dfe994d': DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror