Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b86c38f995b2b102e3e44184ac7ce3102cb94dea
frameworks_base/docs/html/reference/android/support/wearable
History
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
..
activity
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
companion
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
input
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
media
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
provider
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
view
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
watchface
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
package-summary.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.anim.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.animator.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.array.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.attr.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.bool.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.color.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.dimen.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.drawable.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.id.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.integer.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.interpolator.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.layout.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.string.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.style.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
R.styleable.html
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00