git.osdn.net Git - android-x86/frameworks-base.git/commit

(root) / android-x86 / frameworks-base.git / commit

author	Scott Main <smain@google.com>
	Mon, 12 Aug 2013 17:38:03 +0000 (17:38 +0000)
committer	Scott Main <smain@google.com>
	Mon, 12 Aug 2013 17:40:37 +0000 (17:40 +0000)
commit	6dd38cc5343106251c8d66ab11bb93550082e594
tree	5b6d04e1eae33b7b6d265150c38ced1c83485f9f	tree \| snapshot
parent	ebcee19783c4fe5ba776353e95974383850a4685	commit \| diff

Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."

Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4

docs/html/google/gcm/adv.jd		diff \| blob \| history
docs/html/google/gcm/ccs.jd		diff \| blob \| history
docs/html/google/gcm/client.jd		diff \| blob \| history
docs/html/google/gcm/gcm.jd		diff \| blob \| history
docs/html/google/gcm/gs.jd		diff \| blob \| history
docs/html/google/gcm/http.jd	[new file with mode: 0644]	blob
docs/html/google/gcm/notifications.jd		diff \| blob \| history
docs/html/google/gcm/server.jd		diff \| blob \| history
docs/html/google/google_toc.cs		diff \| blob \| history
docs/html/images/gcm/CCS-ack.png	[new file with mode: 0644]	blob
docs/html/images/gcm/GCM-arch.png	[new file with mode: 0644]	blob

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help