| commit | 204fbc6f9495dd8aa18d450b20240390f1785593 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 14:30:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:30:56 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 768bf56f094df041fb753b134d40189431b6bdd1 [diff] | |
| parent | ac8591e1753a96c3c0fed47fdf03dde939d63059 [diff] |
am 6f93345b: am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning" * commit '6f93345b199a3e4bedd31778102751d4dc923f49':