diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-14 19:00:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 19:00:06 +0000 |
| commit | 09fc3d39493c50b938317477cc7095cee853eb33 (patch) | |
| tree | ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047 /Conf | |
| parent | ef7522145a0f1e1f3804268c3b290c6bd2b82156 (diff) | |
| parent | 404ddd4dfd9dbe5f9798ef7366715d740c7ed8c2 (diff) | |
| download | edk2-09fc3d39493c50b938317477cc7095cee853eb33.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" am: 50b0c33452 am: 01f7ad0983android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2
am: 404ddd4dfd
Change-Id: Ia002c42b3c076a76d64973be755e5648c80c51b8
Diffstat (limited to 'Conf')
0 files changed, 0 insertions, 0 deletions