| commit | 043a8dd414d88ef39176688344fe7ff160080985 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Sat Jun 21 00:57:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 21 00:57:00 2014 +0000 |
| tree | 7127d33bb5a37a531d232e1a9c15e60ed2223db6 | |
| parent | 408a6ba50592d0d65c0ad13deb75780c0bb51716 [diff] | |
| parent | b931fca7ebde805e8f070e25f5d8bda774a4614b [diff] |
am b931fca7: resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp * commit 'b931fca7ebde805e8f070e25f5d8bda774a4614b': Fix repo script to ignore tools. DO NOT MERGE.