Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
310,966 Commits 3 Branches 0 Tags
02ffbf039fb44919ead94de04c991a0957c79431
Commit Graph

2 Commits

Author SHA1 Message Date
Joe Fernandez
13697b873c docs: Narnia 2 advertising language update 
b/29009702

Change-Id: Icd060074413c53d6ad24e2919dc80be949a2260c
 2016-06-20 09:08:46 -07:00
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