| commit | a77cd84c7951ee079cd8e439cdc9c08499a5ea24 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:30:50 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:30:50 2019 -0700 |
| tree | b71d7822f77c69a3e39e974640d9258ff9fc2e07 | |
| parent | 82fa4dcd0cfa924fa1a08d1f6ca2e7f0a70450eb [diff] | |
| parent | 8d929cdc25ae704b6403561b60f138cc5c732247 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: bd616ba9f8 -s ours am: 8d929cdc25 -s ours am skip reason: change_id I6031c354be928d5fab9243571ed423b929811ee1 with SHA1 48f633209f is in history Change-Id: I03f43a2a3d3349b308fd11cbdfdfe7e8cb0e6071