OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02eab43 45178b1)
resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev
authorKatie McCormick <kmccormick@google.com>
Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)
committerKatie McCormick <kmccormick@google.com>
Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978

1  2 
docs/html/google/gcm/notifications.jd patch | diff1 | diff2 | blob | history

diff --cc docs/html/google/gcm/notifications.jd
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help