Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
frameworks_base
Repository
7096b660548a15938b2c2fcfda7aa41ec16c4a72
Switch branch/tag
frameworks_base
Android.mk
Find file
Blame
History
Permalink
resolved conflicts for merge of
872a1e79
to master
· a7f88508
Dianne Hackborn
authored
Jun 16, 2011
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
a7f88508
Android.mk
28 KB
Edit
Web IDE
Replace Android.mk
×
Attach a file by drag & drop or
click to upload
Commit message
Replace Android.mk
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.