commit | f73e9cb38f771c73a8370975907798d1ed20cdce | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Fri Jan 23 17:57:21 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 23 17:57:21 2015 +0000 |
tree | 956288167d963c95c412e4ef4ee43fdd08861f82 | |
parent | 8150927e9bac5de33754e1a3c655370001442151 [diff] | |
parent | 0de0b08490028ead3f34063da2e36dc8397376d8 [diff] |
am 0de0b084: am e6a05bf1: Merge "Fix makefile error." * commit '0de0b08490028ead3f34063da2e36dc8397376d8': Fix makefile error.