commit | 581097c616e56358025c5e76d1779308c620321f | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Thu Aug 23 12:34:42 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 12:34:42 2012 -0700 |
tree | 39fcbe6db6f065101074c98da8970a83d4df0d4b | |
parent | d7a5dd9cc42887b8612ad262d0ee41c491205358 [diff] | |
parent | f4236fa4754c85951710d9cf0d3fb9f507985314 [diff] |
am f4236fa4: (-s ours) am 73018ee9: (-s ours) am 7e070a1f: (-s ours) Merge "DO NOT MERGE - Move memory layout to driver." * commit 'f4236fa4754c85951710d9cf0d3fb9f507985314': DO NOT MERGE - Move memory layout to driver.