| commit | a1211dfe75923f037c419c7358c75786cba1e952 | [log] [tgz] |
|---|---|---|
| author | Logan Chien <loganchien@google.com> | Thu Oct 05 09:03:16 2017 +0800 |
| committer | Logan Chien <loganchien@google.com> | Thu Oct 05 09:04:04 2017 +0800 |
| tree | 648a6b0d9be30791b29b9c0622cc1d146837d990 | |
| parent | 1f4bcfde9e38d7ebb13b8740b36bb152aa230418 [diff] | |
| parent | f877bd1d42b9173496b03b23ff1b6076f08003e9 [diff] |
resolve merge conflicts of f877bd1d4 to stage-aosp-master Test: The file is identical to the one in aosp-master Change-Id: I4db1c6a5ce8f7a51c83b833c75aa7d30d2c22dc6