| commit | 4a02112b7909b4ac44b4c8181ccdbe111f4a3d9a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 11:47:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:47:10 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 9bb67f0fedfcb00c6d42c4bccda9506e39d9e8ef [diff] | |
| parent | 3988cfb5a1f16f874de0b3b2ef99e2b7a0f1fd2d [diff] |
am 18f8bb5f: (-s ours) am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable" * commit '18f8bb5f19140eb1029e6646b84c9034c12db166':