| commit | e08a570b430d00f310023af162bc890e38d64e8e | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Jan 15 16:57:03 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 15 16:57:03 2016 +0000 |
| tree | d96e057c988d16b9422c1d1865416ce8106da150 | |
| parent | f4fb94ceab619c9b21e11060ea4f85e69825db13 [diff] | |
| parent | 04ca8065e40409e768670c1a8ba8ae6198ae71b7 [diff] |
Merge "resolve merge conflicts of 69c2907c63 to master."