drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,617 Commits 1 Branch 0 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Dirk Dougherty
240ddd735c Doc change: remove intl/nn from collections paths. 
Change-Id: I45c0322d39a54e2565401d11bdc56d7e8e555cd2

Bug-Id: 31940660
 2016-10-05 16:49:43 +00:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev 
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
 2016-04-19 02:03:59 -07:00