| commit | d15bacb7a8d4bb309a47f97b59222a56633438a0 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 14:29:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:29:36 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 74c44564fd8ef3415408b9b0b78a22f2eb5043a6 [diff] | |
| parent | 4a02112b7909b4ac44b4c8181ccdbe111f4a3d9a [diff] |
am 394c81c8: am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable" * commit '394c81c8bd608784f6c6d0236debb2e33c5b5711':