| commit | df5f870d989bd1f3c94466adace1e3879d77178e | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Oct 30 15:44:58 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Fri Oct 30 15:44:58 2015 -0700 |
| tree | 6df1d843fb3dc29fc607a45d68bf822ee53b0536 | |
| parent | bac13378ca2490e98e814908984bc9184ed1d42b [diff] | |
| parent | 07c6628d68da39582d8d682bc9c849be8bfaaa10 [diff] |
resolve merge conflicts of 07c6628d68 to master. Change-Id: I29c9b408956c578ce1cfe0eb5d8704b7a5d2f818