| commit | 419aec6c3c0ec51b1451fffac731f244cd458444 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Apr 10 16:02:55 2017 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Mon Apr 10 16:13:56 2017 +0900 |
| tree | ce78dcfdc5a9a6983f2ed2a51bc199ddffdad8cf | |
| parent | 0a782794d159793bbd26f836a08bf0c3390d226d [diff] | |
| parent | edb6946bd1190f015d2eebfa14ec76decab7d335 [diff] |
resolve merge conflicts of edb6946bd119 to oc-dev-plus-aosp Test: make -j64 framework services Change-Id: Ia87be346703637ebcb88bcf39d7e8c3c71db44ab