| commit | f48adf63512f1d5a4dbe40ce37e5946b434e8be9 | [log] [tgz] |
|---|---|---|
| author | Yurii Zubrytskyi <zyy@google.com> | Fri May 27 11:07:40 2016 -0700 |
| committer | Yurii Zubrytskyi <zyy@google.com> | Fri May 27 11:07:40 2016 -0700 |
| tree | ff8c198dd06ce7e0ff4a20eec5325e84ea803ece | |
| parent | 16dad488b362d3812f9d67b4b751ba6cde22590d [diff] | |
| parent | a9e2b99a7fdd31bcd6d852c6db26fe592236a24f [diff] |
resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp Change-Id: Ic77afb008f68ebc455d3a788119b669a52a254dc