| commit | 638bfd9e87b081092ae1ccacae240b9962f2d366 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Jul 18 21:16:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 18 21:16:01 2013 -0700 |
| tree | ba0eb9624d3958fff1de85ce39bc4bf12c181366 | |
| parent | 8e3405d85a334565e262f41c9a23740c043f83a4 [diff] | |
| parent | ba32c249addded770c288771748aa25d554352a0 [diff] |
am ba32c249: resolved conflicts for merge of 4d9f670b to stage-aosp-master * commit 'ba32c249addded770c288771748aa25d554352a0': Fix issue 52986: Wifi settings abnormal when screen rotation