| commit | c2ae6fb9ada52e9c990542a6d1cae80085318f31 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Jan 15 21:27:13 2015 -0800 |
| committer | Jeff Sharkey <jsharkey@android.com> | Thu Jan 15 21:27:13 2015 -0800 |
| tree | 1b438f7e0145d9705df7c41b6df37fb561bc1182 | |
| parent | 6ba9c529fda8aba5f1157b4ff3feb1a494e673ad [diff] | |
| parent | 605eb79c9519307147fc1795d0eb155638a7f542 [diff] |
Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge Change-Id: Id6db8cce3a477572478a1d50f624823200848896