| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2016-04-19 | Resolve merge conflicts of a5060ee to nyc-dev | Trevor Johns | |
| This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086 | |||
| 2012-06-21 | Massive clobber of all HTML files in developer docs for new site design | Scott Main | |
| Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3 | |||
 |
index : Project-1CE/frameworks_base | |
| Unnamed repository; edit this file 'description' to name the repository. | Linux User |
| summaryrefslogtreecommitdiff |