| commit | 15b9a5cb0bc741359efeeb4147029e32d61cd6ff | [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 | 18ac13ee2ca040ecb0c2e8ef80138153c0723a9e | |
| parent | 9066887765012ef8613ede2fd7e1506b759cadfc [diff] | |
| parent | 6030b66a9be68ff964234e0981aa20a5a0435c0c [diff] |
resolved conflicts for merge of 687c6221 to master Change-Id: I9e8a24d9151f31bc3284ad7f8686fa7f3c25c0d9