| commit | b4f73f34e8cb2b41862cc4c543b4b2ade40bde74 | [log] [tgz] |
|---|---|---|
| author | Julien Desprez <jdesprez@google.com> | Tue Aug 20 03:36:31 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 20 03:36:31 2019 -0700 |
| tree | c4235ec2e0d9cdbb149cf158eb752c6f8bea6d98 | |
| parent | e889d534fa17f8ca563dae0af0eb51042e627555 [diff] | |
| parent | 0834cd0a064c845b48fce99c2154d55615e7c368 [diff] |
[automerger skipped] Ensure we use the version.txt when available am: 77846085c0 am: 103f1ea4e9 am: 043b8850e8 am: 0834cd0a06 -s ours am skip reason: change_id I50ee5a5f47131ec970b9116996b36971cd59bc40 with SHA1 77846085c0 is in history Change-Id: Iba1c2d069d9a29f2b110d1d2722defd01c5c3688