Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,620 Commits 3 Branches 0 Tags
ccf9c8376595ddbed64cedd236349cb99a2e8708
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
Aleks Haecky
881e729904 docs: Add peformance tools getting started docs in new tools/performance subtree. 
Bug: 231376
Change-Id: I8126a0c71f3e87bbb2e3823aacbe0ab20c59d5a9
 2015-05-26 11:45:58 -07:00