| commit | f1301d86fb7f414330b08dd9514436e65ba69ceb | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Apr 29 15:29:13 2013 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Mon Apr 29 15:29:13 2013 -0700 |
| tree | b0a1944d373ec02db2c33e45008da173138fb8a5 | |
| parent | b98212925e41e9420ce6fefc3fe204b29c8f7a83 [diff] | |
| parent | b3f6687756ffb660f834ef673bed04b2d4a26d21 [diff] |
Merge commit 'b3f66877' into afdmerge Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24