| commit | 7be7d86ce9d15ab94ace2e69fc192c226ad18a3b | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Tue Sep 24 15:40:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 24 15:40:41 2013 -0700 |
| tree | ed01a9ec4e5dca2260b0f67a53daedcd77492709 | |
| parent | 9b7d148466b1aedb24187294e0c59718afb104a0 [diff] | |
| parent | 5ded30c9b780c584c9d1984cc019f7d1d0b38fe5 [diff] |
am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev * commit '5ded30c9b780c584c9d1984cc019f7d1d0b38fe5': Asset import from ux-assets