| commit | 261e00cb046db01b2bae9342f34ff99e99ada368 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Aug 13 10:57:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 10:57:31 2013 -0700 |
| tree | d25b0324f18857576e140dc05d705428b4fd40be | |
| parent | e50078961ab0134ff5bcf57a9e8cc4b04027f942 [diff] | |
| parent | b478b10f34a9fa9c6b42f54047eb9e77111a16c7 [diff] |
am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. * commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7': Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.