| commit | ab96721a57637cc9132bddb09f407d2a9976dce8 | [log] [tgz] |
|---|---|---|
| author | Ajay Panicker <apanicke@google.com> | Tue Mar 14 14:01:57 2017 -0700 |
| committer | Ajay Panicker <apanicke@google.com> | Tue Mar 14 14:01:57 2017 -0700 |
| tree | 7d1dd660d537f03b55aa451f77c74a57b1cbfc5f | |
| parent | 5cd3bb93ce6b63dbe9f19d7ad45be2a87904762c [diff] | |
| parent | 4b39c15da0f5d100b9ce6fc29a8f499362c53542 [diff] |
resolve merge conflicts of 4b39c15da0f5 to nyc-mr2-dev-plus-aosp Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f