| commit | e5d087b118e4f633eeb56cf529ca558921bb6423 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Oct 30 10:06:59 2012 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Tue Oct 30 10:06:59 2012 -0700 |
| tree | a3c288de03eb5c2e6c74f71e5ebd0d87abc464b3 | |
| parent | b8cf0ec7d0213217821697bdb7aac03cde0747b2 [diff] | |
| parent | 847cfefee729a8ac06d175da18d30647b36e1bfe [diff] |
resolved conflicts for merge of 847cfefe to master Change-Id: I5be8d782075997ca62da869aa24cb1ccc2d4643e