| commit | f46b30a87164e0182f8f8075aa6412e041ecdf54 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Apr 20 12:01:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 20 12:01:44 2015 +0000 |
| tree | 04bfc7b09eda25cb6584c503063bcf9463fda104 | |
| parent | d8a4a4f78721867f20d7486ca974d208cf955b1e [diff] | |
| parent | e9553ae31a50f858e353d4956cd214f60cc407a1 [diff] |
am e9553ae3: am 2e0f89b1: Merge "Fix lint error." * commit 'e9553ae31a50f858e353d4956cd214f60cc407a1': Fix lint error.