am 863d1ac9: (-s ours) am 1cbfc6c9: DO NOT MERGE. Follow up change to I8b38e280 Add visual indicator that long press / or @ on F1 key will bring up Settings

Browse Source

Merge commit '863d1ac94898f2f770645baecc21184e18581267'

* commit '863d1ac94898f2f770645baecc21184e18581267':
  DO NOT MERGE.  Follow up change to I8b38e280

main

Ken Wakasa 2010-10-18 09:32:06 -07:00 committed by Android Git Automerger

parent 2348ca0e76 863d1ac948

commit c7c2472afb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available