| commit | 5023a4df732693fdaff64da551f6b088e7ba4456 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Sep 25 16:48:01 2013 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Wed Sep 25 16:48:01 2013 -0700 |
| tree | 0c7ce60967f87cc29b5c7da085d5b0a6b6017994 | |
| parent | 6e0f3df07c5cd14def5a316b3e0dbebb6600d41c [diff] | |
| parent | 687c6221c8fd3f093641c25e830cd39bbcdae9b1 [diff] |
resolved conflicts for merge of 687c6221 to master Change-Id: I9e8a24d9151f31bc3284ad7f8686fa7f3c25c0d9