| commit | ab69476a2be4a60ca73e1721cb46e956e87ec29a | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Aug 13 14:51:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 14:51:31 2013 -0700 |
| tree | 26f9a38df70f298fdddf97ecd3c8ff6a2bdd687a | |
| parent | 63113994034e2e71bac40d2de076fa9b1b406960 [diff] | |
| parent | 9b979448581311f27456c1dcb9623a8d21bcf64f [diff] |
am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. * commit '9b979448581311f27456c1dcb9623a8d21bcf64f': Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.