| commit | 87073654df1102b6fa33d16c9d346de16845450d | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Oct 20 16:17:21 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Tue Oct 20 16:17:21 2015 -0700 |
| tree | 2ae97d59bd78b7eb5738843b4929d837d7d71c8f | |
| parent | e3aafb7917123daed832695b409dcc05b4bd1b4e [diff] | |
| parent | 27ddeff723eba240899d6f1860a08314e9d2d7ad [diff] |
resolve merge conflicts of 27ddeff723 to master. Change-Id: I6dad081fc6dfafb78d5bd73d84e184bae7f6fd1b