commit | e3ba5f6dfa95b99746cead176822244f9ec39d1f | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Aug 21 15:07:59 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 21 15:07:59 2018 -0700 |
tree | ffa7f6a6d5c20d54136d0497787aaca2dec6bb67 | |
parent | 68e9d6157af442a60f8a12f20e6ff2596c4874c0 [diff] | |
parent | 80c53bce68e31129d0bdbba1a35ae3be1772ed7e [diff] |
[automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi-dev am: 8d82158036 am: 80c53bce68 -s ours Change-Id: Ie247f02047b3d1f646dbdd762e94d9daac6ff18b