| commit | 825c1c2b43ed69d9c04db1f53ec22588b847f264 | [log] [tgz] |
|---|---|---|
| author | Yuntao Xu <yuntaoxu@google.com> | Fri Apr 30 17:30:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 17:30:23 2021 +0000 |
| tree | 81b1f55504683541f4183f9fb474d74c0e5ce452 | |
| parent | 6e4fbaaebcf703f12359ab8ab4a793a7062917f8 [diff] | |
| parent | 4472cf6306b19aa69777e1a7ad98f96c83a1d056 [diff] |
Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 Original change: https://android-review.googlesource.com/c/platform/development/+/1691910 Change-Id: Ic3915e4611926ebfc0c24b8d3cb15d1612642194