| commit | 4a3b0c7587dc995e00ed4e7d7ed61544f7715d2c | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Mon Aug 22 15:13:01 2016 -0700 |
| committer | John Reck <jreck@google.com> | Mon Aug 22 15:13:01 2016 -0700 |
| tree | 2b476e8f9b1e0a6b7d9461045468aa50cc89f1c0 | |
| parent | 2a739b4fabc0b221c88764cc4263375e7d507512 [diff] | |
| parent | 24e38ab322a0c396df1c6fe95f3f427d85cd5da1 [diff] |
resolve merge conflicts of 24e38ab to stage-aosp-master Change-Id: I25844e17d2d6371ed786833c756051d19d0abec4