| commit | 2436ec217c82ea71c4ea3998e5c14d5b98a60a46 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 15 01:30:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 15 01:30:08 2017 +0000 |
| tree | ebcc52309dabf3b2174a22db7d9086b0a82fe410 | |
| parent | 5b88b69067a25ae7fd613ea267561b9accabe586 [diff] | |
| parent | 220871a697290529278ed16db508eda8e12f3fc7 [diff] |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. am: 220871a697 -s ours Change-Id: I2d08ca9a952babfd1480278ca6331b697be2a32e