| commit | 50f9de42f71645f433e4be355bf0080c07a7b90b | [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 | 40ff310ae4dfee2b18cde3ed5c3385c1344f17b6 [diff] | |
| parent | f20734bb8efd6b0d2f8a072678606cac24e46f3d [diff] |
resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp Change-Id: Ic77afb008f68ebc455d3a788119b669a52a254dc