| commit | c8ae454bfdebf7a9a0bc0ce07a20ac9cd053618d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 06 18:29:16 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 06 18:29:16 2018 -0700 |
| tree | 18f257635c5932debdf209206c6c663c85a5ab8c | |
| parent | 93b26da8d9fd2eb20a3d0cb750693cfc4c559301 [diff] | |
| parent | 86983ac0a832a46b3a623c69cdb3c91c0b016b90 [diff] |
Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240 am: 86983ac0a8 Change-Id: I51399455ab8809315ad1c859304983f84df5ee75