| commit | d56dd7e73336c1b2211b17483a1df86224bd7074 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Nov 17 10:00:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 10:00:55 2014 +0000 |
| tree | d3d25de7ec29fcdf4c4dbcb82bb9ddc8f2a514ab | |
| parent | edb1361a234032d3a51b3a56c3d98888f4ad1518 [diff] | |
| parent | ba5aa6b628aa41d0fd5bf030004fe1d2ab743317 [diff] |
am ba5aa6b6: am 6a35b981: Merge "Fix lint error." * commit 'ba5aa6b628aa41d0fd5bf030004fe1d2ab743317': Fix lint error.