tree 020a394376b079de443003dac49a982d77c008ac
parent c97dc3c240bccca82c4894c9e9e8b3e8b306781f
parent 18ee8219aaaae0c93e3696e1ae66e0f692756d8c
author twyen <twyen@google.com> 1507570073 +0000
committer android-build-merger <android-build-merger@google.com> 1507570073 +0000

Merge "Implement InCallUiLock" am: 63e639710c
am: 18ee8219aa

Change-Id: I4dfddb73f49b29e80e4c367e888d68f545f94e62