No description
Find a file
SzuWei Lin 35998bb8e5 resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52993c61a80bc7aee3d49ce37b88413e8f40f832
2017-06-14 11:56:25 +08:00
core Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev 2017-06-13 19:52:46 +00:00
target resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp 2017-06-14 11:56:25 +08:00
tests Only set TARGET_PLATFORM version in lunch when explicitly requested 2017-05-01 14:26:40 -07:00
tools Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" am: 463c25f890 2017-06-14 00:34:06 +00:00
.gitignore Add build subprojects to .gitignore 2015-07-23 13:18:47 -07:00
Android.mk Add new Android.mk to handle repo move 2016-06-16 15:30:19 -07:00
buildspec.mk.default Add TARGET_PLATFORM_VERSION to lunch 2017-03-23 09:44:08 -07:00
CleanSpec.mk Move version checking to soong_ui 2017-05-15 14:02:38 -07:00
envsetup.sh Merge "Teach mgrep to find soong/*.go files." am: 46d9bf8f9a am: bb67e3ae54 am: f515b91b3f 2017-05-18 18:29:40 +00:00