| commit | ce761d1fef4da2a4dec3eb538d103fcde1971dba | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Tue Feb 16 10:15:00 2016 -0800 |
| committer | Christopher Wiley <wiley@google.com> | Tue Feb 16 10:17:16 2016 -0800 |
| tree | a7ad143d5d85008143de9fdfddd7d84c32c27706 | |
| parent | 689a3917b406dd65e2783f08f2238a3d56a4ec29 [diff] | |
| parent | c25621f0e52dbf78159b5aa28b8c19ed6a7a053b [diff] |
resolve merge conflicts of c25621f0e5 to nyc-dev-plus-aosp Change-Id: I36983f261e91f9fc1b41ff54ba604fa616ada0ff