| commit | 1dbce5f1e55bdc61a767cd82b59a3919a4683b5e | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Wed Oct 10 16:09:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 16:09:41 2012 -0700 |
| tree | 1dbcfaeb4f36018117863bd2dfcae7564234ac3d | |
| parent | 0a75ed0805dd7f97ff058623eb8e4f4b258c44ab [diff] | |
| parent | 05ab277c21731ab11333c56d7d2266b9b1c4d46d [diff] |
am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev * commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d': Doc changes: misc GCM updates.