| commit | 8f7d445c65a7f34e1eb35a91ea069b95ffd915af | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Jun 28 19:20:18 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Tue Jun 28 19:20:18 2016 -0700 |
| tree | 762b20f69e99b644c797e20dc70574e5b7f67c0f | |
| parent | 5243288837d1c3698500caeeae2d661249f32450 [diff] | |
| parent | 23c2e74025e93fa95237ae09af5570cd70240687 [diff] |
resolve merge conflicts of 3fdcf8c to nyc-mr1-dev-plus-aosp Change-Id: Idaecc3eb0e30ce8e58b79065598d1866739488f8