commit | 1de7048d2b692aa17cd22cd5dd21a611d9b517cc | [log] [tgz] |
---|---|---|
author | Naveen Kumar <kumarn@codeaurora.org> | Fri Jun 16 16:38:59 2017 +0530 |
committer | Naveen Kumar <kumarn@codeaurora.org> | Fri Jun 16 16:38:59 2017 +0530 |
tree | b193b62a5fbe89e7eb90d36bb9e7f766598b3d73 | |
parent | 8dfb9f372e5ea3d2a0b73f38e6d94b384b14cc69 [diff] | |
parent | 79451c85ae9a3532d2d52c5aadbfd707df415372 [diff] |
Merge commit '79451c85ae9a3532d2d52c5aadbfd707df415372' into remote Conflicts: common/file_contexts common/hal_camera.te common/radio.te common/system_app.te Change-Id: I32fc385e14582dd84feedd15e83074f0a1bbf6bf