summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-08-06Merge changes from topic "offlinesdk-docs"temp_p_mergeNan Zhang
2018-08-06[automerger skipped] Add offline/online-sdk-docs in Soong.Nan Zhang
2018-08-06Merge "Depend on a module instead of real dir for metalava_merge_annotations_...Nan Zhang
2018-08-07Merge changes from topic "offlinesdk-docs"Nan Zhang
2018-08-06Merge "Depend on a module instead of real dir for metalava_merge_annotations_...Nan Zhang
2018-08-06Merge "Remove public API methods from hiddenapi-light-greylist.txt"David Brazdil
2018-08-06Merge "Remove public API methods from hiddenapi-light-greylist.txt"David Brazdil
2018-08-06Merge "Fix the system_error while calling thread::join() in NativeCallbackThr...rleix
2018-08-06[automerger skipped] Merge "Clean up MediaMetadataRetriever use"Hans Boehm
2018-08-06Merge "Fix the system_error while calling thread::join() in NativeCallbackThr...Treehugger Robot
2018-08-06Fix the system_error while calling thread::join() in NativeCallbackThread.rleix
2018-08-06Merge "Clarify which methods return connected sockets"Adam Vartanian
2018-08-06Merge "Clean up MediaMetadataRetriever use"Hans Boehm
2018-08-06Merge "Add libcore as owners of relevant android/net files"Adam Vartanian
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
2018-08-06Merge "Add utils to convert Inet4Address <-> int"Remi NGUYEN VAN
2018-08-06resolve merge conflicts of 606d3975b23ec725085f8ae16ba4074fd05a556a to stage-...Mathew Inwood
2018-08-06Merge "Clarify which methods return connected sockets"Treehugger Robot
2018-08-06Merge "Add libcore as owners of relevant android/net files"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Add libcore as owners of relevant android/net filesAdam Vartanian
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
2018-08-06Add @UnsupportedAppUsage annotationsMathew Inwood
2018-08-06Add @UnsupportedAppUsage annotationsMathew Inwood
2018-08-06resolve merge conflicts of d609a403426118498ea17ec4ca3bc4ab9d4d057b to stage-...Mathew Inwood
2018-08-06Merge "Add utils to convert Inet4Address <-> int"Remi NGUYEN VAN
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi
2018-08-04Import translations. DO NOT MERGEBill Yi