| commit | 2d65e85e38fc04d934ed329e988af52e2878022a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Jul 15 15:54:20 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Wed Jul 15 15:54:20 2015 -0700 |
| tree | 83d315414916123ca1f22e16026690af746c48d9 | |
| parent | 81c3a01eb67fe16180cdd9c6a5f565e612d31ba7 [diff] | |
| parent | d8d8363d4ebcf7f744ef26b4b8a396c0461c16b0 [diff] |
Merge commit '3bc83eb0' into downstream Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5