| commit | 94c529b8d1119a452227238d54dcad86216478e7 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Fri Aug 09 19:31:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 09 19:31:19 2013 -0700 |
| tree | eea5794db716c0d68886e508e8515ed470edab2b | |
| parent | 9b7b4450185e723dc7021f7e8bae4a12d4dd5606 [diff] | |
| parent | 385bb2eb5184686c2d953fe4757522e61acb3392 [diff] |
am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev * commit '385bb2eb5184686c2d953fe4757522e61acb3392': Doc change: collapse key fix.