| commit | d18450d240f321157fdb013d97669a96c781b6c7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 06 17:56:04 2018 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Aug 06 17:56:04 2018 -0700 |
| tree | fe1f882c2196582981a78d81f59e4516916c6f6d | |
| parent | 61f6dc4c240b710a9695fa505010f6eeb2472b8b [diff] | |
| parent | f8e12c51d49691549efedd32e7adcc58b228826b [diff] |
Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master