OSDN Git Service

am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
authorKatie McCormick <kmccormick@google.com>
Wed, 10 Oct 2012 23:06:19 +0000 (16:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 23:06:19 +0000 (16:06 -0700)
commit05ab277c21731ab11333c56d7d2266b9b1c4d46d
tree6acf3da98e660348a8606fe355bba525fbdbb5d2
parent3f542740065f3708f70acb48dd93651ed896e029
parentfa4865f680cc151ff051b7a82fb0e94145d70377
am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev

* commit 'fa4865f680cc151ff051b7a82fb0e94145d70377':
  Doc changes: misc GCM updates.