| commit | cffd384452e1b3db22c59b15a2a5aaeb44b4c661 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Jun 25 00:34:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 00:34:16 2014 +0000 |
| tree | 8b2436be769c5e7360a8d1026c3743e79b0ce9b3 | |
| parent | e401cf2c7f16f574f89b16c265b88a574d08f85a [diff] | |
| parent | 0b65bf6b1b56efafb383c3902c0d8ba419f2657b [diff] |
am 0b65bf6b: (-s ours) am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements * commit '0b65bf6b1b56efafb383c3902c0d8ba419f2657b': DO NOT MERGE add butterbar notice for the google IO SDK announcements