| commit | fea840a1ea0dbcc0690c80c914164c10aea8e8f2 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Thu Dec 07 23:32:18 2017 +0000 |
| committer | Stephen Li <stephenli@google.com> | Thu Dec 07 23:32:18 2017 +0000 |
| tree | e14551538e69da23f4a8b9bf4af6d3e233e4380e | |
| parent | 9787f3cac2dc96e3a36d9acef6a766dcf5db90d5 [diff] | |
| parent | 6ec4c2e3aff427690e9d27625b583add7f98b4f1 [diff] |
Manually merge changes from giant AOSP topic Change-Id: I6fefa3e010a11d438ea1867a5062d185b4682c27