| commit | 950abbd0751e863364a1ad976713a959bcb2dc8c | [log] [tgz] |
|---|---|---|
| author | Pavlin Radoslavov <pavlin@google.com> | Fri Jun 03 11:12:17 2016 -0700 |
| committer | Pavlin Radoslavov <pavlin@google.com> | Fri Jun 03 11:12:17 2016 -0700 |
| tree | 808860d8a26062a46308fdbec5e39d1cea3c3544 | |
| parent | cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf [diff] | |
| parent | 9eb774054ee0b643a11ab2c8e814adc7c563a74c [diff] |
resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp Change-Id: I93f0fc1c427b02b0c864901f0a55e4cfaba35032