| commit | 05ab277c21731ab11333c56d7d2266b9b1c4d46d | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Wed Oct 10 16:06:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 16:06:19 2012 -0700 |
| tree | 6acf3da98e660348a8606fe355bba525fbdbb5d2 | |
| parent | 3f542740065f3708f70acb48dd93651ed896e029 [diff] | |
| parent | fa4865f680cc151ff051b7a82fb0e94145d70377 [diff] |
am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev * commit 'fa4865f680cc151ff051b7a82fb0e94145d70377': Doc changes: misc GCM updates.