commit | 164cca0f60326109ce8537fe32113af0787134f6 | [log] [tgz] |
---|---|---|
author | Roshan Pius <rpius@google.com> | Wed Oct 16 13:19:35 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 16 13:19:35 2019 -0700 |
tree | 1beba2239128979b36ad79004497f205a6cc2b38 | |
parent | 1f341640c485ac98acf038cc6fa82d5c74f31c30 [diff] | |
parent | 92f0fab452c0f1ab816b131538bb31d9fbb87c5b [diff] |
[automerger skipped] Merge changes Ice7f8995,I7a788777 into qt-qpr1-dev am: ee958526ff am: 92f0fab452 -s ours am skip reason: change_id Ice7f89952c0a71c181ea5de58e417c02e7f2bf91 with SHA1 0d07c698f2 is in history Change-Id: I2a2f624c4486c0209e6da4f716e4b0185f5aeba0