| commit | 77cb283f93c095ca62c202087f72b4177ff2c550 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 06 21:33:10 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 06 21:33:10 2018 -0700 |
| tree | 90f0f487f549c138a3ba49d80038bd4dd0976a19 | |
| parent | 577fa0555e7897c8f0340e3f7acb5362b1896c5e [diff] | |
| parent | c8ae454bfdebf7a9a0bc0ce07a20ac9cd053618d [diff] |
Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240 am: 86983ac0a8 am: c8ae454bfd Change-Id: I6318c7081069dc2df41420a00d2378078d86a463