| commit | 47556fcdf84919309623b6474e80b09a087b9e26 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Thu Jun 22 19:22:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 19:22:15 2017 +0000 |
| tree | 233bb78bb6944bf4f89bdb6bd2e2c5b30f99d830 | |
| parent | 05aa9c66b310f7fb7aa748de7131af4c61f29430 [diff] | |
| parent | 83e57f1e303ae8517b0d20f094538748bfb0a835 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 71183d6eab am: 466e090f06 am: ca8a8eebc2 am: 83e57f1e30 Change-Id: I20a6bc9bfdf857769b12bbd3fcc37fe1e89cda3f