| commit | 0ab6b24e07be374f3e700fb272a9e93652ce0d94 | [log] [tgz] |
|---|---|---|
| author | SzuWei Lin <szuweilin@google.com> | Fri Sep 29 15:51:45 2017 +0800 |
| committer | SzuWei Lin <szuweilin@google.com> | Fri Sep 29 15:51:45 2017 +0800 |
| tree | 2e724edc2ad2c30121a9a44d7c6a10e00620a704 | |
| parent | e3196ada4c0e636cdfc25079e1a4eb4ad8f1906b [diff] | |
| parent | 40ef25d7bd9de2a33c56d9777243b96d91fdec6b [diff] |
resolve merge conflicts of 40ef25d7bd to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I39cf0099b857d38222a81c7be41ec13cebb1fb7a