| 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 | |||
| 2015-06-15 | am e84aa5fd: am 125e1d52: am d2161615: am c6d33420: am 4decc115: Merge "Doc ↵ | Dirk Dougherty | |
| change: move ndk docs jd into main docs tree." into mnc-preview-docs * commit 'e84aa5fdcfa4b96807a5d223feef3319b00f150d': Doc change: move ndk docs jd into main docs tree. | |||
| 2015-06-12 | Doc change: move ndk docs jd into main docs tree. | Dirk Dougherty | |
| Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea | |||
 |
index : Project-1CE/frameworks_base | |
| Unnamed repository; edit this file 'description' to name the repository. | Linux User |
| summaryrefslogtreecommitdiff |