Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,162 Commits 3 Branches 0 Tags
6818cd554050152821175eb3d429275e6cc3267d
Commit Graph

3 Commits

Author SHA1 Message Date
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev 
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
 2016-04-19 02:03:59 -07:00
Dirk Dougherty
66f1c66980 am e84aa5fd: am 125e1d52: am d2161615: am c6d33420: am 4decc115: Merge "Doc 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-15 16:20:01 +00:00
Dirk Dougherty
a73450cd27 Doc change: move ndk docs jd into main docs tree. 
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea
 2015-06-12 15:18:07 -07:00