Mark Salyzyn 1ae7379baa resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Bug: 34250038 Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f		2017-04-12 09:11:38 -07:00
..
Android.bp	consumerir.default: remove unneeded dependency.	2017-04-12 03:25:10 +00:00
consumerir.c	consumerir.default: remove unneeded dependency.	2017-04-12 03:25:10 +00:00