| commit | 1a74cc6de99d93234c4daf2c56d9ffd39be25c58 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Oct 23 13:46:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 23 13:46:21 2013 -0700 |
| tree | 5cb792a939e2bf3f992fa867bb2310aab7c2c538 | |
| parent | c68d50954c67d02bbb0dd4ea992ba34f63753c18 [diff] | |
| parent | d5fdded86912e9c6a3b28034803989656e9a80ad [diff] |
am d5fdded8: resolved conflicts for merge of d8eb423a to klp-dev * commit 'd5fdded86912e9c6a3b28034803989656e9a80ad': Also check legacy path