| commit | ea92d5d1c0074e2bbede89a1af5a152999b866aa | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 08 15:39:30 2016 -0400 |
| committer | Jason Monk <jmonk@google.com> | Wed Jun 08 15:39:30 2016 -0400 |
| tree | 3df3e8a01189efe82ca35795b145788eb1bd78bf | |
| parent | 202d7a4f483ba4301abc7a0672c5acd243b986ec [diff] | |
| parent | 781e8c2bfbe90f3e3f7a5f0400edce2ccd474854 [diff] |
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp Change-Id: I737217ecc25a6c480132c6f1a932c4579fa96e05