| commit | 416671f6215938e2eeb4b265932c6ec3531dedce | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Mon Aug 22 22:42:42 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Mon Aug 22 22:42:42 2016 -0700 |
| tree | e491ed2a8fbd2581da911ae635b55b73c134ace9 | |
| parent | d8a3d8ee51b9b60c3228dee0eb171940c83d00db [diff] | |
| parent | 08134d0acdadb1c85c378c6e37a19e3e20698202 [diff] |
resolve merge conflicts of 852a4c7 to nyc-mr1-dev-plus-aosp Change-Id: Ifc076749b4e23af00e0c900a28dfe770adb3e6b6