| commit | 238f4aafd211b1ce7c6e6d6d672e8e9301c99ed5 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu May 26 15:01:20 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Thu May 26 15:01:20 2016 -0700 |
| tree | 24784de960712a88b1a22fbd3640226a6ec1a308 | |
| parent | b4da199b68f6707fb4d9b664055fc752bfb5c60d [diff] | |
| parent | dfcf2e0cbbd30dd0b76ba2839922a29ae5569132 [diff] |
resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b