| commit | 37cbee829173da6b62da75c285b7269fa5064bcd | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Mon Jun 29 17:52:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:52:49 2015 +0000 |
| tree | 1b4eb72c1efbfaca9e9623c976040ecdd208fff5 | |
| parent | 67b39c228137123f33b99ff4dda014f68cf9c787 [diff] | |
| parent | 5ddd98364b8a66912ce75207cae11c648e828bc0 [diff] |
am 5ddd9836: am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ub-launcher3-almonte * commit '5ddd98364b8a66912ce75207cae11c648e828bc0': Add extras required for compilation