| commit | 146adf9434478e8a5ec56b220926f12486480b31 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed May 17 12:11:59 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed May 17 14:29:44 2017 +0900 |
| tree | 3dbd746e0c93c1b2e7457b073599a54203253a02 | |
| parent | 12f918dfa5415e264c1f7c3622e9a44da4390595 [diff] | |
| parent | 6b28227b43f1628e152096eab680f66eb2a4de17 [diff] |
resolve merge conflicts of fbe942724 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Merged-In: I137c17d55940b783eab6d0125bc4d26b96bcc2f2 Change-Id: I90c3ff7c82a9b53ce00057fd87cf227d5faf0975