| commit | 4bac6e11aef61e508303711f034e81e224b31699 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Nov 20 23:47:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 23:47:07 2014 +0000 |
| tree | 55ef48053e4f42f7cfa7b0b6e2195eec88cda8ae | |
| parent | 2670d5ad59ffb6f34ddbc4578e9321ce1c0410b5 [diff] | |
| parent | 3a091b79978caa9b5d58ae19f693279e5a717c2a [diff] |
am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp * commit '3a091b79978caa9b5d58ae19f693279e5a717c2a': Fix clang warnings in core/jni.