| commit | 6dbf6fda8c0bcd3b6454fc4885b7a710e64ae3b6 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Oct 30 22:45:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 30 22:45:53 2015 +0000 |
| tree | f6c79b187f256bf9d7b4f3647055a97880259027 | |
| parent | b2d295636956fe238915f7d1d6ab2aa42f4e9c2c [diff] | |
| parent | df5f870d989bd1f3c94466adace1e3879d77178e [diff] |
Merge "resolve merge conflicts of 07c6628d68 to master."