| commit | 86983ac0a832a46b3a623c69cdb3c91c0b016b90 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 06 18:11:13 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 06 18:11:13 2018 -0700 |
| tree | 095baa4c1d0d0cd1880bc324905433dea0cfe7aa | |
| parent | b80a1c469c4fd7c2219381b6e117485a82ed587b [diff] | |
| parent | d18450d240f321157fdb013d97669a96c781b6c7 [diff] |
Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240 Change-Id: I61802a7c65b27283f34576a561ba9724ad4e11ed