| commit | 1e6b474bfaaae3921ca88c8201bdeae7c67c9d37 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 19 23:30:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 23:30:57 2014 +0000 |
| tree | 579071f0efdffb3f01685fcf69374d4ff8b8e979 | |
| parent | 6d8f5664c60b57b53627d8d1757551a61d72fb4f [diff] | |
| parent | 5648b12da1357345b06ff86d41ff70a92d803093 [diff] |
am cd29983b: resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp * commit 'cd29983b31c1da70289fa3589770933333389921': Clean up test makefiles.