| commit | 404ddd4dfd9dbe5f9798ef7366715d740c7ed8c2 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Dec 14 18:53:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 18:53:32 2016 +0000 |
| tree | ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047 | |
| parent | 2639bfcf3287de0c287846836f0294ee5c63e74a [diff] | |
| parent | 01f7ad0983138d99f68b2355cff81c71c4b74677 [diff] |
Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" am: 50b0c33452 am: 01f7ad0983 Change-Id: I6aff15f5a7145c8745b8726e1d3b24f87b48280a