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

2 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
7470945396 Doc change: adjust distribute and preview card grids and styles. 
Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73
 2015-05-17 20:36:16 -07:00