| commit | 4f1e084744ee82f29a8e6c04f99a1d915e44be12 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Thu Dec 07 23:22:35 2017 +0000 |
| committer | Stephen Li <stephenli@google.com> | Thu Dec 07 23:22:35 2017 +0000 |
| tree | ab94d7804676f75491d22bc6ab6a4a3189a4f5f1 | |
| parent | c2845ea1aad5b1b60dc3eaa777393df38378b848 [diff] | |
| parent | 4049c79dcdf693ad25927fdf1e9b32823e2d0413 [diff] |
Manually merge changes from giant AOSP topic Change-Id: I46bbec40cf9322e223b18a8995e657121eb96ba2