Justin Yun ef4f57af4a resolve merge conflicts of eb247544a7 to oc-mr1-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib0c5ade0a1db65491b21226d5a2686ff6cf32d74		2017-10-31 15:27:52 +09:00
..
board	emulator: fix widevine drm vndbinder denial	2017-10-26 16:45:05 -07:00
product	resolve merge conflicts of eb247544a7 to oc-mr1-dev-plus-aosp	2017-10-31 15:27:52 +09:00
Android.mk	Remove the need to find Android.mk files via directory symlinks	2017-08-07 14:21:20 -07:00