| commit | 54a26180adf6700db14cf35080313e75ae1037ec | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon May 16 13:18:54 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 16 13:18:54 2011 -0700 |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 | |
| parent | ec2c9751d802853ac1e9898cbcebf47efe7668d8 [diff] | |
| parent | d3cf1ea694aa302804687b50aa8ce6306903382a [diff] |
am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 * commit '60e13114eb806d50b7b362d39051c5c775704bf6': DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.