| commit | ac8591e1753a96c3c0fed47fdf03dde939d63059 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 11:49:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:38 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | b6c5b39a18dc1bafcb1d9596d94ff4678bf4fb4c [diff] | |
| parent | d0c60cd1fe4975d45991d7bab5ae5ac2fb32fb48 [diff] |
am 2bcba6de: (-s ours) am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning" * commit '2bcba6dede9d0ad42f3192f9163ea33bea4e1bc0':