| commit | 0ac72cff4dd86cc7f4e4ef0d30f1dc7651ac9dbb | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Dec 12 17:31:36 2016 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Mon Dec 12 17:31:36 2016 -0700 |
| tree | 274ec6a62b48faa8fb2a33e6c8bb362c95d5819c | |
| parent | e8a23195805f7cca255a3928184cacc68cd65ad0 [diff] | |
| parent | d77e675d5f206f8e9825b2fd99908d7cf0583544 [diff] |
resolve merge conflicts of d77e675 to master Change-Id: I211db442e0081ee51f889b1fe788dad08889c2ec