Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,934 Commits 3 Branches 0 Tags
b86c38f995b2b102e3e44184ac7ce3102cb94dea
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
Rich Slogar
9ef94efaea docs: studio 1.3 annotation-update 
Change-Id: I36bcdb314bbf319d7e4a8da6ec5f4a8ff8487c94
 2015-07-30 11:47:20 -07:00
Rich Slogar
2a3aa2d343 docs: studio 1.2 updates 
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
 2015-04-29 19:47:25 -07:00