| commit | 8f54a7c5159a72268c7a1ab7252819e307263a55 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Mon Jul 02 21:04:39 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 02 21:04:39 2018 +0000 |
| tree | 3f61f8b1ba43a2340ac2d627ddf184dcb3f0d0c3 | |
| parent | ca48d745473ec16d75f2dcec19ddf19015769214 [diff] | |
| parent | 06ca2744298933cd89ddc30c9d38e6d6b19447f5 [diff] |
Merge changes Ibae2de51,I1d6718d9 * changes: Allow share/edit screenshot actions from lockscreen Prevent clobbering of activity options bundle when merging