| commit | d123e361cf3d27563391418953a773d915e2d15d | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed May 17 17:04:34 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed May 17 08:18:25 2017 +0000 |
| tree | 771ca9363bfd8394970538e2e4e93be20e387a00 | |
| parent | de5779eed14cf0c33133c59c69d0722a8d5c86d4 [diff] | |
| parent | 375f1a4d3288a43cb0b6441906c693301b21e78d [diff] |
Merge commit 'refs/changes/42/2258242/1' of sso://googleplex-android/platform/hardware/libhardware into merge Test: I solemnly swear I tested this conflict resolution. Merged-In: I1e1619de7deaa0e6610180e585bd7775887bc562 Change-Id: I55aeadd1baa5ff62c7414b7c768b70addb1d8177