| commit | 4404da4dbfd5f3976bde5ee317685fbcffcd3c2a | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Jan 03 11:54:14 2017 -0800 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Tue Jan 03 11:54:14 2017 -0800 |
| tree | 0d308499683d0b728b4db4a32a616bfbad2bd439 | |
| parent | 527e5a4a5edbc8ecf9baf301be3eccbaf39d7507 [diff] | |
| parent | a094f07d53c9a892a6a7013e02899bdcff0cd15f [diff] |
resolve merge conflicts of a094f07d5 to nyc-mr2-dev-plus-aosp Change-Id: I20a607d9195adadb3db0d10b61c935651970f8ce