| commit | ec5d193efff1e0ee40b717ab7ba89b53a185a9f3 | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Tue Jul 18 12:44:26 2017 +0800 |
| committer | Hsin-Yi Chen <hsinyichen@google.com> | Wed Jul 19 14:06:16 2017 +0000 |
| tree | d323d949a58d7920b686ff2db58f7cb02c71990f | |
| parent | 759febd41f095a44f1f6e8865e7438330c780b55 [diff] | |
| parent | 4798f66948ced14e0444ecbdc6f797d06a39b215 [diff] |
resolve merge conflicts of 4798f66 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I4a80322d5eef9eb646ced164c3969f22a3c1537b